Merge "AArch64: Use long for pointers in RS Java/JNI code"