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

Change-Id: I9a6d0817788de76a4886548a0314b4d40576a449