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

* commit '12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
  stagefright aacenc: Fix type definitions for 64 bit platforms
tree: 8f9fbe49ae5228b83f80239e8dcb8d773b78175b
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/