Merge "DO NOT MERGE Separate libstagefright_{ccodec|codecbase} from libstagefright" into pi-dev