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

Change-Id: Ibd0cf6bb6c1aae9ae84ecca71c8b45056ed94233