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