Merge "ARM64: Improve LocationBuilder for Shifts and IntermediateAddress."
am: 60afd6fe28

Change-Id: I2667c3dfc496b23ac2ea0146c28cce3cc72cde98