Merge "OMXCodec: enhance error handling of OMX IL client"