am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"

* commit '7ffa4546de0b9e22b4896731cdfd1655f61a0b6c':
  stagefright aacenc: Add const declarations to some pointers