Merge "stagefright: Remove OMXCodec object" into nyc-dev