Merge "hwc: gpu_tonemapper: improve checkEglError()"