Merge "ARM: Fix the CallOtherJustTooFarAfter test." am: 5e11568dfc
am: e6ecdd086c

Change-Id: Ic8b46aa0bfec8382ac6170a561973cf583c0dc4f