am 936a2ce0: am 0b87c470: Merge "Fix thumb2 assembler\'s ShifterOperandCanHold."

* commit '936a2ce0aa12785c2042c39659d399140fcf8cf0':
  Fix thumb2 assembler's ShifterOperandCanHold.