am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

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