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

Change-Id: If6f0b35b72a1c4dfe456fc94483c72297b5c4556