Merge "Stop using OMX_COLOR_FormatAndroidPrivateStart."