Merge "Fix DEQP failure regarding VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT:" into oc-dr1-dev
am: 4e831d2e4e

Change-Id: Ic931253156a23da71112fb6608427efee54b77e4