Merge "Revert "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.""