am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"

* commit '4de803c76d4afd0f542c086b555b71729b3c5796':
  stagefright aacenc: Avoid warnings about incompatible pointer types