Merge "media: Add level 6+ OMX enums for AVC/H.264"