Merge "stagefright: link CCodec directly with libstagefright"