[automerger skipped] Merge "EGL: two fixes for colorspace attribute handling" am: 49db2b17f6 am: a3685e3031
am: 48a3df3d09  -s ours

Change-Id: I665a74e621d5dca85fbdfac0b198372fb71eef58