Merge "Optimizing/ARM: Improve long shifts by 1."