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

* commit '2a535d755db5c365041625cfda4e533c93899d60':