am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit '74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
  AArch64: Use long for pointers in SurfaceTexture