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