Merge "Revert "Forbid the use of shifts in ShifterOperand in Thumb2""