Merge "ARM: Fix JNI MacroAssembler after VIXL update."
am: ae7f6b965e

Change-Id: Ia433a1b5eda0b825aecc992103823a44ca9a713c