am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
  stagefright aacenc: Avoid warnings about incompatible pointer types
tree: 88f72f0a473bdedcb2512f579149f309ccdbb80e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/