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

Change-Id: I3679d9f37ad732042fadfe4341ba89a5e1e20100