Merge vk-gl-cts/opengl-es-cts-3.2.5 into vk-gl-cts/opengl-es-cts-3.2.6

Change-Id: I0eff6803c285cd39b3f6eab0343522f48c1701cf