Merge "EGL: two fixes for colorspace attribute handling" am: 49db2b17f6
am: a3685e3031

Change-Id: I37534c1e82aae238dface0d306923ee404bce61b