Merge "AArch64: Use long for pointers in android/os/MemoryFile"