am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"

* commit 'd7a54c6574c3ca759e977f27912caecb6b40e827':
  AArch64: Use long for pointers in android/os/MemoryFile