Merge "Work around CTS failure in eglCreateImageKHR." into pi-dev am: 6318d31dca
am: b0f9e35566

Change-Id: I0938f9c51f3c67bbbd83aa6f93c753947445c352