Merge "Work around CTS failure in eglCreateImageKHR." into pi-dev