Merge "stagefright aacenc: Add const declarations to some pointers"