Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev

Change-Id: I326010e9a243d5c94c63d23c48c39e1dcab34320

diff --cc external/vulkancts/modules/vulkan/api/CMakeLists.txt
Simple merge

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 24d5467,1df4a02..f95be67
--- 1/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
--- 2/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@@ -45,10 -46,8 +46,9 @@@
  #include "deRandom.hpp"
  #include "deStringUtil.hpp"
  #include "deUniquePtr.hpp"
 +#include "deMath.h"
  #include "tcuStringTemplate.hpp"
  
- #include <cmath>
  #include "vktSpvAsmComputeShaderCase.hpp"
  #include "vktSpvAsmComputeShaderTestUtil.hpp"
  #include "vktTestCaseUtil.hpp"