Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745 am: 5dee7d5...