Merge "AArch64: Jni compiler fixes"