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

* commit '80ef1745d00c235b117e389e56e58210cf88e5c8':
  stagefright aacenc: Make the mem_malloc function 64-bit safe