Merge vk-gl-cts/vulkan-cts-1.3.4 into vk-gl-cts/vulkan-cts-1.3.5

Change-Id: I04c012af54c82eb4eba8661f5bbc56eca50f5010

diff --cc external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
Simple merge

diff --cc scripts/android/build_apk.py
index ef7d6ae,b39d4b7..724453d
--- 1/scripts/android/build_apk.py
--- 2/scripts/android/build_apk.py
+++ b/scripts/android/build_apk.py
@@@ -39,14 -39,14 +39,14 @@@ import xml.etree.ElementTre
  # Import from <root>/scripts
  sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
  
 -from build.common import *
 -from build.config import *
 -from build.build import *
 +from ctsbuild.common import *
 +from ctsbuild.config import *
 +from ctsbuild.build import *
  
  class SDKEnv:
-       def __init__(self, path):
+       def __init__(self, path, desired_version):
                self.path                               = path
-               self.buildToolsVersion  = SDKEnv.selectBuildToolsVersion(self.path)
+               self.buildToolsVersion  = SDKEnv.selectBuildToolsVersion(self.path, desired_version)
  
        @staticmethod
        def getBuildToolsVersions (path):