am d6d56dd7: am 2a535d75: am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"

* commit 'd6d56dd71c366455d22f6784465b6a206f2bc4bf':