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

Change-Id: I5bf0711c3f3545b5ff6a6ab3bb558583fb046735