Merge "Add EGL and GLES2 modules to CTS build"