Merge bug fixes from Khronos CTS release branch am: 3d8e6ee58a
[platform/upstream/VK-GL-CTS.git] / MODULE_LICENSE_APACHE2