Update tracetooltests

We now source Vulkan-Headers from tracetooltests, avoiding
the possibility of a mismatch between the headers of it and
us.

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "external/density"]
 	path = external/density
 	url = http://github.com/centaurean/density
-[submodule "external/Vulkan-Headers"]
-	path = external/Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
 [submodule "tracetooltests"]
 	path = tracetooltests
 	url = https://github.com/ARM-software/tracetooltests.git

CMakeLists.txt

@@ -48,7 +48,7 @@ else()
     message(STATUS "XCB and X11 support not added")
 endif()
 
-if(NOT EXISTS "${CMAKE_SOURCE_DIR}/external/Vulkan-Headers/.git")
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/external/tracetooltests/external/Vulkan-Headers/.git")
     message(SEND_ERROR "git submodules not available. Please run: git submodule update --init --recursive")
 endif()
 
@@ -116,7 +116,7 @@ set(COMMON_INCLUDE
     PUBLIC ${SRC_ROOT}/generated
     PUBLIC ${SRC_ROOT}/external
     PUBLIC ${SRC_ROOT}/external/tracetooltests/include
-    PUBLIC ${SRC_ROOT}/external/Vulkan-Headers/include
+    PUBLIC ${SRC_ROOT}/external/tracetooltests/external/Vulkan-Headers/include
     PRIVATE ${SRC_ROOT}/external/jsoncpp
 )
 
@@ -189,8 +189,8 @@ add_custom_command(
     COMMAND ${PYTHON_EXECUTABLE} ${SRC_ROOT}/scripts/tostring.py
     COMMAND touch .autogenerated
     WORKING_DIRECTORY ${SRC_ROOT}
-    DEPENDS ${SRC_ROOT}/scripts/lava.py ${SRC_ROOT}/external/Vulkan-Headers/registry/vk.xml ${SRC_ROOT}/external/tracetooltests/scripts/spec.py ${SRC_ROOT}/src/hardcode_read.cpp
-	${SRC_ROOT}/src/hardcode_write.cpp ${SRC_ROOT}/scripts/util.py ${SRC_ROOT}/external/Vulkan-Headers/include/vulkan/vk_layer.h ${SRC_ROOT}/scripts/vk_wrapper.py
+    DEPENDS ${SRC_ROOT}/scripts/lava.py ${SRC_ROOT}/external/tracetooltests/external/Vulkan-Headers/registry/vk.xml ${SRC_ROOT}/external/tracetooltests/scripts/spec.py
+	${SRC_ROOT}/src/hardcode_read.cpp ${SRC_ROOT}/src/hardcode_write.cpp ${SRC_ROOT}/scripts/util.py ${SRC_ROOT}/scripts/vk_wrapper.py
 )
 
 # The below is necessary because cmake is too braindead to realize we should not run the above once per target