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

* commit '459df4ef8368ea84ce7d07981c6867a7b7fef14e':
  stagefright aacenc: Avoid warnings about incompatible pointer types