Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"