32 bit int shifted by an amount not in the range -31..31 (FindBugs)

Java language specification:
"If the promoted type of the left-hand operand is int, only the five
lowest-order bits of the right-hand operand are used as the shift distance.
It is as if the right-hand operand were subjected to a bitwise logical AND
operator & (§15.22.1) with the mask value 0x1f.
The shift distance actually used is therefore always
in the range 0 to 31, inclusive."

Change-Id: If69ca0410115581e6593ccfe3ba154c3fe7d6eba
Merge "32 bit int shifted by an amount not in the range -31..31 (FindBugs)" into cm-11.0
Merge branch 'cm' into HEAD