Merge "remove OMXCodec.h dependency"