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

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