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

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