Merge \"Fix GLES2 format mismatch\" into marshmallow-cts-dev