layers: Update VUIDs for 1.1

- Add new VUIDs to database and vuid_mapping.py
- Remove deleted VUIDs from database
- Update vuid_mapping.py to disregard KHR/KHX suffix
- Update spec.py json comparison to update more fields from existing
  VUIDs and delete entries for removed VUIDs
- Update layers and tests that were pointing to deleted VUIDs to use
  replacements
- Revert vuid_mapping.py and run_all_tests.sh workarounds for undefined
  private VUIDs

Change-Id: Ie6c5b01237d5917be66a35337e3dbaf42fea3b00
diff --git a/layers/object_tracker_utils.cpp b/layers/object_tracker_utils.cpp
index e500564..d8d86c0 100644
--- a/layers/object_tracker_utils.cpp
+++ b/layers/object_tracker_utils.cpp
@@ -448,7 +448,7 @@
 
 VKAPI_ATTR void VKAPI_CALL GetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue) {
     std::unique_lock<std::mutex> lock(global_lock);
-    ValidateObject(device, device, kVulkanObjectTypeDevice, false, VALIDATION_ERROR_29605601, VALIDATION_ERROR_UNDEFINED);
+    ValidateObject(device, device, kVulkanObjectTypeDevice, false, VALIDATION_ERROR_43405601, VALIDATION_ERROR_UNDEFINED);
     lock.unlock();
 
     get_dispatch_table(ot_device_table_map, device)->GetDeviceQueue2(device, pQueueInfo, pQueue);