Merge "EGL_test: add 4 colorspace tests" am: e2c3de42a4
am: f113ccf5fa

Change-Id: I99c89f332e8fa5edc5ae82a2c10ed8c0c302b9ba