Remove change of L_shl_sat/L_shl which is not supposed to be part of the merge request.