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

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