am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"

* commit '98539a4eba7677c0b1ddc12f800c7075851ef302':
  stagefright amrwbenc: Make the mem_malloc function 64-bit safe
tree: 6739824d3eb9aff3fe2b538e41ef458a721cd83f
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/