Merge "Enable deqp ES2 and EGL tests"