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

Change-Id: I0a8e846e9b679591fd5079657ff6e49fed5b308f