Merge "remove OMXCodec.cpp dependency"