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

Change-Id: I2a972a234184ede3227a4dc55758407a447483f0