Merge vk-gl-cts/opengl-es-cts-3.2.4 into vk-gl-cts/master