am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"

* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms