Merge "Fix thumb2 assembler's ShifterOperandCanHold."