Merge \"Optimize away useless masking operations on shift amounts.\"
am: f249230400

Change-Id: I7012b320625831f0cd63c5b49e545d4dc9922b18