Merge "DO NOT MERGE Separate libstagefright_{ccodec|codecbase} from...
Merge "DO NOT MERGE Separate libstagefright_{ccodec|codecbase} from libstagefright" into pi-dev am: ae7e5099
am: 552394cd -s ours
Change-Id: I6dbbdd166c19146488b5be2ce91629aa99349756