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

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