am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

* commit 'a012fee3c31803799176f3efb75cf2f929eeb062':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer