Merge \\\\\\\\"Fix GLES2 format mismatch\\\\\\\\" into marshmallow-cts-dev am: 98dd6a...