am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"

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