Revert gradle roll (#91459)

* Revert "Mark last failing test after gradle update as flaky. (#91423)" This reverts commit 46a52d03. * Revert "fix android template for Gradle 7 (#91411)" This reverts commit 51d06d53. * Revert "Add explicit version for mac and windows openjdk. (#91408)" This reverts commit bf429f27. * Revert "Update the openjdk version used by linux android tests. (#91405)" This reverts commit 2144ab8b. * Revert "Migrate to Gradle 7.0.2 / AGP 7.0.1 (#90642)" This reverts commit b6459f9b.

Revert gradle roll (#91459)
* Revert "Mark last failing test after gradle update as flaky. (#91423)" This reverts commit 46a52d03. * Revert "fix android template for Gradle 7 (#91411)" This reverts commit 51d06d53. * Revert "Add explicit version for mac and windows openjdk. (#91408)" This reverts commit bf429f27. * Revert "Update the openjdk version used by linux android tests. (#91405)" This reverts commit 2144ab8b. * Revert "Migrate to Gradle 7.0.2 / AGP 7.0.1 (#90642)" This reverts commit b6459f9b.
5188df08 · Zachary Anderson · GitHub · f753168c · 5188df08 · 5188df08
Unverified Commit 5188df08 authored Oct 08, 2021 by Zachary Anderson Committed by GitHub Oct 08, 2021
148 changed files
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -45,7 +45,7 @@ platform_properties:
        [
          {"dependency": "android_sdk"},
          {"dependency": "curl"},
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk"}
        ]
      os: Linux
      device_os: "N"
@@ -84,7 +84,7 @@ platform_properties:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "version:11"}
+          {"dependency": "open_jdk"}
        ]
      os: Mac-10.15
      device_os: N
@@ -167,7 +167,7 @@ platform_properties:
            {"dependency": "android_sdk"},
            {"dependency": "certs"},
            {"dependency": "chrome_and_driver", "version": "version:84"},
-            {"dependency": "open_jdk", "version": "version:11"}
+            {"dependency": "open_jdk"}
          ]
      os: Windows-10
      device_os: N
@@ -185,20 +185,17 @@ targets:
  - name: Linux build_aar_module_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      add_recipes_cq: "true"
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -218,16 +215,12 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "clang"},
          {"dependency": "cmake"},
          {"dependency": "ninja"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "1_2"
      tags: >
@@ -242,16 +235,12 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "clang"},
          {"dependency": "cmake"},
          {"dependency": "ninja"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "2_2"
      tags: >
@@ -324,17 +313,11 @@ targets:
  - name: Linux firebase_abstract_method_smoke_test
    recipe: firebaselab/firebaselab
-    bringup: true
    timeout: 60
    properties:
      dependencies: >-
        [
-          {"dependency": "android_sdk"},
+          {"dependency": "android_sdk"}
-          {"dependency": "open_jdk", "version": "11"}
-        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
        ]
      tags: >
        ["firebaselab"]
@@ -343,17 +326,11 @@ targets:
  - name: Linux firebase_android_embedding_v2_smoke_test
    recipe: firebaselab/firebaselab
-    bringup: true
    timeout: 60
    properties:
      dependencies: >-
        [
-          {"dependency": "android_sdk"},
+          {"dependency": "android_sdk"}
-          {"dependency": "open_jdk", "version": "11"}
-        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
        ]
      tags: >
        ["firebaselab"]
@@ -362,17 +339,11 @@ targets:
  - name: Linux firebase_release_smoke_test
    recipe: firebaselab/firebaselab
-    bringup: true
    timeout: 60
    properties:
      dependencies: >-
        [
-          {"dependency": "android_sdk"},
+          {"dependency": "android_sdk"}
-          {"dependency": "open_jdk", "version": "11"}
-        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
        ]
      tags: >
        ["firebaselab"]
@@ -482,19 +453,16 @@ targets:
  - name: Linux gradle_desugar_classes_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -507,17 +475,16 @@ targets:
  - name: Linux gradle_java8_compile_test
    recipe: devicelab/devicelab_drone
+    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -530,19 +497,16 @@ targets:
  - name: Linux gradle_plugin_bundle_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -555,19 +519,16 @@ targets:
  - name: Linux gradle_plugin_fat_apk_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -580,19 +541,16 @@ targets:
  - name: Linux gradle_plugin_light_apk_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -605,19 +563,16 @@ targets:
  - name: Linux module_custom_host_app_name_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -631,19 +586,16 @@ targets:
  - name: Linux module_host_with_custom_build_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -657,19 +609,16 @@ targets:
  - name: Linux module_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -687,14 +636,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -712,14 +659,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -761,8 +706,7 @@ targets:
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -789,13 +733,9 @@ targets:
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
          {"dependency": "clang"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "1_4"
      tags: >
@@ -818,13 +758,9 @@ targets:
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
          {"dependency": "clang"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "2_4"
      tags: >
@@ -847,13 +783,9 @@ targets:
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
          {"dependency": "clang"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "3_4"
      tags: >
@@ -876,13 +808,9 @@ targets:
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
          {"dependency": "clang"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "4_4"
      tags: >
@@ -949,8 +877,7 @@ targets:
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "chrome_and_driver", "version": "version:84"},
+          {"dependency": "chrome_and_driver", "version": "version:84"}
-          {"dependency": "open_jdk", "version": "11"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -1296,7 +1223,6 @@ targets:
  - name: Linux_android android_obfuscate_test
    recipe: devicelab/devicelab_drone
-    bringup: true # Failing after gradle update https://github.com/flutter/flutter/issues/91422
    presubmit: false
    timeout: 60
    properties:
@@ -1548,6 +1474,17 @@ targets:
      task_name: flutter_gallery__start_up
    scheduler: luci
+  - name: Linux_android flutter_gallery__start_up_delayed
+    recipe: devicelab/devicelab_drone
+    bringup: true
+    presubmit: false
+    timeout: 60
+    properties:
+      tags: >
+        ["devicelab","android","linux"]
+      task_name: flutter_gallery__start_up_delayed
+    scheduler: luci
  - name: Linux_android flutter_gallery_android__compile
    recipe: devicelab/devicelab_drone
    presubmit: false
@@ -1735,13 +1672,8 @@ targets:
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
          {"dependency": "android_virtual_device", "version": "31"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      tags: >
        ["framework","hostonly"]
    timeout: 60
@@ -1755,12 +1687,7 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "android_virtual_device", "version": "31"},
-          {"dependency": "curl"},
+          {"dependency": "curl"}
-          {"dependency": "open_jdk", "version": "11"}
-        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
        ]
      tags: >
        ["framework","hostonly"]
@@ -1769,20 +1696,18 @@ targets:
  - name: Mac build_aar_module_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      add_recipes_cq: "true"
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "gems"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"}
        ]
      tags: >
@@ -1801,13 +1726,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -1830,15 +1754,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "1_4"
      tags: >
@@ -1854,15 +1774,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "2_4"
      tags: >
@@ -1878,15 +1794,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "3_4"
      tags: >
@@ -1902,15 +1814,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "4_4"
      tags: >
@@ -2037,13 +1945,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2062,13 +1969,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2083,18 +1989,16 @@ targets:
  - name: Mac gradle_plugin_light_apk_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2113,13 +2017,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2139,13 +2042,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2165,13 +2067,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2191,13 +2092,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2217,13 +2117,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2243,13 +2142,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2270,13 +2168,12 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"}
        ]
@@ -2299,15 +2196,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "1_4"
      tags: >
@@ -2328,15 +2221,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "2_4"
      tags: >
@@ -2357,15 +2246,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "3_4"
      tags: >
@@ -2386,15 +2271,11 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "xcode"},
          {"dependency": "gems"},
          {"dependency": "goldctl"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "4_4"
      tags: >
@@ -3394,20 +3275,18 @@ targets:
  - name: Windows build_aar_module_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      add_recipes_cq: "true"
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3428,14 +3307,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "1_3"
      tags: >
@@ -3451,14 +3326,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "2_3"
      tags: >
@@ -3474,14 +3345,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: build_tests
      subshard: "3_3"
      tags: >
@@ -3580,19 +3447,17 @@ targets:
  - name: Windows gradle_plugin_bundle_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3605,20 +3470,18 @@ targets:
  - name: Windows gradle_plugin_fat_apk_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    presubmit: false
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3627,19 +3490,17 @@ targets:
  - name: Windows gradle_plugin_light_apk_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3670,18 +3531,13 @@ targets:
  - name: Windows module_custom_host_app_name_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3695,19 +3551,17 @@ targets:
  - name: Windows module_host_with_custom_build_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3721,19 +3575,17 @@ targets:
  - name: Windows module_test
    recipe: devicelab/devicelab_drone
-    bringup: true
    timeout: 60
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3751,14 +3603,13 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3776,14 +3627,13 @@ targets:
    properties:
      caches: >-
        [
-          {"name":"gradle","path":"gradle"},
+          {"name":"gradle","path":"gradle"}
-          {"name": "openjdk", "path": "java11"}
        ]
      dependencies: >-
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"}
+          {"dependency": "open_jdk"}
        ]
      tags: >
        ["devicelab","hostonly"]
@@ -3804,14 +3654,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "1_5"
      tags: >
@@ -3832,14 +3678,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "2_5"
      tags: >
@@ -3860,14 +3702,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "3_5"
      tags: >
@@ -3888,14 +3726,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "4_5"
      tags: >
@@ -3916,14 +3750,10 @@ targets:
        [
          {"dependency": "android_sdk"},
          {"dependency": "chrome_and_driver", "version": "version:84"},
-          {"dependency": "open_jdk", "version": "11"},
+          {"dependency": "open_jdk"},
          {"dependency": "goldctl"},
          {"dependency": "vs_build"}
        ]
-      caches: >-
-        [
-          {"name": "openjdk", "path": "java11"}
-        ]
      shard: tool_integration_tests
      subshard: "5_5"
      tags: >

--- a/dev/benchmarks/complex_layout/android/build.gradle
+++ b/dev/benchmarks/complex_layout/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:7.0.0=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:7.0.0=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:7.0.0=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:30.0.0=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:30.0.0=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:30.0.0=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:30.0.0=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:7.0.0-7396180=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:7.0.0=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:7.0.0=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:7.0.0=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:7.0.0=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:7.0.0=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:7.0.0=classpath
 com.android.tools.build:bundletool:1.6.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:7.0.0=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:7.0.0=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:30.0.0=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:30.0.0=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:30.0.0=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-model:30.0.0=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.utp:android-device-provider-gradle-proto:30.0.0=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.0=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.0=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:annotations:30.0.0=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:common:30.0.0=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:dvlib:30.0.0=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:repository:30.0.0=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android.tools:sdk-common:30.0.0=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android.tools:sdklib:30.0.0=classpath
-com.android:signflinger:7.0.1=classpath
+com.android:signflinger:7.0.0=classpath
-com.android:zipflinger:7.0.1=classpath
+com.android:zipflinger:7.0.0=classpath
 com.github.gundy:semver4j:0.16.4=classpath
 com.google.android:annotations:4.1.1.4=classpath
 com.google.api.grpc:proto-google-common-protos:1.12.0=classpath

--- a/dev/benchmarks/complex_layout/android/project-app.lockfile
+++ b/dev/benchmarks/complex_layout/android/project-app.lockfile
@@ -24,34 +24,35 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:30.0.0=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:30.0.0=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:30.0.0=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:7.0.0=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:7.0.0=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:7.0.0=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:7.0.0=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:7.0.0=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:30.0.0=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:30.0.0=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:30.0.0=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:30.0.0=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:30.0.0=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:30.0.0=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:30.0.0=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:30.0.0=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:30.0.0=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:30.0.0=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint:30.0.0=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools:annotations:30.0.0=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools:common:30.0.0=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:dvlib:30.0.0=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:repository:30.0.0=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:sdk-common:30.0.0=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:sdklib:30.0.0=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android:signflinger:7.0.0=lintClassPath
+com.android:zipflinger:7.0.0=lintClassPath
 com.beust:jcommander:1.78=lintClassPath
 com.github.javaparser:javaparser-core:3.17.0=lintClassPath
 com.google.code.findbugs:jsr305:2.0.1=debugAndroidTestCompileClasspath
@@ -156,4 +157,4 @@ org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
 org.testng:testng:7.3.0=lintClassPath
 xerces:xercesImpl:2.12.0=lintClassPath
 xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
+empty=androidApis,androidJdkImage,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
--- a/dev/benchmarks/complex_layout/android/project-integration_test.lockfile
+++ b/dev/benchmarks/complex_layout/android/project-integration_test.lockfile
@@ -24,34 +24,35 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:30.0.0=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:30.0.0=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:30.0.0=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:7.0.0=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:7.0.0=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:7.0.0=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:7.0.0=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:7.0.0=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:30.0.0=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:30.0.0=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:30.0.0=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:30.0.0=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:30.0.0=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:30.0.0=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:30.0.0=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:30.0.0=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:30.0.0=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:30.0.0=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint:30.0.0=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools:annotations:30.0.0=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools:common:30.0.0=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:dvlib:30.0.0=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:repository:30.0.0=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:sdk-common:30.0.0=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:sdklib:30.0.0=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android:signflinger:7.0.0=lintClassPath
+com.android:zipflinger:7.0.0=lintClassPath
 com.beust:jcommander:1.78=lintClassPath
 com.github.javaparser:javaparser-core:3.17.0=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
@@ -155,4 +156,4 @@ org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
 org.testng:testng:7.3.0=lintClassPath
 xerces:xercesImpl:2.12.0=lintClassPath
 xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
+empty=androidApis,androidJdkImage,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
--- a/dev/benchmarks/macrobenchmarks/android/build.gradle
+++ b/dev/benchmarks/macrobenchmarks/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/benchmarks/macrobenchmarks/android/project-app.lockfile
+++ b/dev/benchmarks/macrobenchmarks/android/project-app.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,90 +69,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/benchmarks/macrobenchmarks/android/project-integration_test.lockfile
+++ b/dev/benchmarks/macrobenchmarks/android/project-integration_test.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,90 +69,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/benchmarks/microbenchmarks/android/build.gradle
+++ b/dev/benchmarks/microbenchmarks/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/benchmarks/multiple_flutters/android/build.gradle
+++ b/dev/benchmarks/multiple_flutters/android/build.gradle
@@ -10,7 +10,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:7.0.1"
+        classpath "com.android.tools.build:gradle:4.1.2"
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        // NOTE: Do not place your application dependencies here; they belong

--- a/dev/benchmarks/multiple_flutters/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/benchmarks/multiple_flutters/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
--- a/dev/benchmarks/platform_views_layout/android/build.gradle
+++ b/dev/benchmarks/platform_views_layout/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/benchmarks/platform_views_layout/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/benchmarks/platform_views_layout/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/benchmarks/platform_views_layout/android/project-app.lockfile
+++ b/dev/benchmarks/platform_views_layout/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle
+++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/project-app.lockfile
+++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/benchmarks/test_apps/stocks/android/build.gradle
+++ b/dev/benchmarks/test_apps/stocks/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile
+++ b/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/benchmarks/test_apps/stocks/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/benchmarks/test_apps/stocks/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/benchmarks/test_apps/stocks/android/project-app.lockfile
+++ b/dev/benchmarks/test_apps/stocks/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/abstract_method_smoke_test/android/build.gradle
+++ b/dev/integration_tests/abstract_method_smoke_test/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/abstract_method_smoke_test/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/abstract_method_smoke_test/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/abstract_method_smoke_test/android/project-app.lockfile
+++ b/dev/integration_tests/abstract_method_smoke_test/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenci
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,89 +62,47 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
 org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
--- a/dev/integration_tests/android_custom_host_app/build.gradle
+++ b/dev/integration_tests/android_custom_host_app/build.gradle
@@ -8,7 +8,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
    }
 }

--- a/dev/integration_tests/android_custom_host_app/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/android_custom_host_app/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/project-app.lockfile
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,89 +62,47 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
 org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
--- a/dev/integration_tests/android_embedding_v2_smoke_test/android/project-battery.lockfile
+++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/project-battery.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRu
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/android_host_app_v2_embedding/build.gradle
+++ b/dev/integration_tests/android_host_app_v2_embedding/build.gradle
@@ -8,7 +8,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
    }
 }

--- a/dev/integration_tests/android_host_app_v2_embedding/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/android_host_app_v2_embedding/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/android_semantics_testing/android/build.gradle
+++ b/dev/integration_tests/android_semantics_testing/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/android_semantics_testing/android/project-app.lockfile
+++ b/dev/integration_tests/android_semantics_testing/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/android_views/android/build.gradle
+++ b/dev/integration_tests/android_views/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/android_views/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/android_views/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/android_views/android/project-app.lockfile
+++ b/dev/integration_tests/android_views/android/project-app.lockfile
@@ -19,43 +19,43 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -63,87 +63,39 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/android_views/android/project-path_provider.lockfile
+++ b/dev/integration_tests/android_views/android/project-path_provider.lockfile
@@ -19,43 +19,43 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRu
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -63,88 +63,41 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/channels/android/build.gradle
+++ b/dev/integration_tests/channels/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/channels/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/channels/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/channels/android/project-app.lockfile
+++ b/dev/integration_tests/channels/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/deferred_components_test/android/build.gradle
+++ b/dev/integration_tests/deferred_components_test/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/deferred_components_test/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/deferred_components_test/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/external_ui/android/build.gradle
+++ b/dev/integration_tests/external_ui/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/external_ui/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/external_ui/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/external_ui/android/project-app.lockfile
+++ b/dev/integration_tests/external_ui/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/flavors/android/build.gradle
+++ b/dev/integration_tests/flavors/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/flavors/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/flavors/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/flavors/android/project-app.lockfile
+++ b/dev/integration_tests/flavors/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=freeDebugAndroidTestCompileClasspath,freeDebugCompi
 androidx.savedstate:savedstate:1.0.0=freeDebugAndroidTestCompileClasspath,freeDebugCompileClasspath,freeDebugRuntimeClasspath,freeDebugUnitTestCompileClasspath,freeDebugUnitTestRuntimeClasspath,freeProfileCompileClasspath,freeProfileRuntimeClasspath,freeProfileUnitTestCompileClasspath,freeProfileUnitTestRuntimeClasspath,freeReleaseCompileClasspath,freeReleaseRuntimeClasspath,freeReleaseUnitTestCompileClasspath,freeReleaseUnitTestRuntimeClasspath,paidDebugAndroidTestCompileClasspath,paidDebugCompileClasspath,paidDebugRuntimeClasspath,paidDebugUnitTestCompileClasspath,paidDebugUnitTestRuntimeClasspath,paidProfileCompileClasspath,paidProfileRuntimeClasspath,paidProfileUnitTestCompileClasspath,paidProfileUnitTestRuntimeClasspath,paidReleaseCompileClasspath,paidReleaseRuntimeClasspath,paidReleaseUnitTestCompileClasspath,paidReleaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=freeDebugAndroidTestCompileClasspath,freeDebugCompileClasspath,freeDebugRuntimeClasspath,freeDebugUnitTestCompileClasspath,freeDebugUnitTestRuntimeClasspath,freeProfileCompileClasspath,freeProfileRuntimeClasspath,freeProfileUnitTestCompileClasspath,freeProfileUnitTestRuntimeClasspath,freeReleaseCompileClasspath,freeReleaseRuntimeClasspath,freeReleaseUnitTestCompileClasspath,freeReleaseUnitTestRuntimeClasspath,paidDebugAndroidTestCompileClasspath,paidDebugCompileClasspath,paidDebugRuntimeClasspath,paidDebugUnitTestCompileClasspath,paidDebugUnitTestRuntimeClasspath,paidProfileCompileClasspath,paidProfileRuntimeClasspath,paidProfileUnitTestCompileClasspath,paidProfileUnitTestRuntimeClasspath,paidReleaseCompileClasspath,paidReleaseRuntimeClasspath,paidReleaseUnitTestCompileClasspath,paidReleaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=freeDebugAndroidTestCompileClasspath,freeDebugCompileClasspath,freeDebugRuntimeClasspath,freeDebugUnitTestCompileClasspath,freeDebugUnitTestRuntimeClasspath,freeProfileCompileClasspath,freeProfileRuntimeClasspath,freeProfileUnitTestCompileClasspath,freeProfileUnitTestRuntimeClasspath,freeReleaseCompileClasspath,freeReleaseRuntimeClasspath,freeReleaseUnitTestCompileClasspath,freeReleaseUnitTestRuntimeClasspath,paidDebugAndroidTestCompileClasspath,paidDebugCompileClasspath,paidDebugRuntimeClasspath,paidDebugUnitTestCompileClasspath,paidDebugUnitTestRuntimeClasspath,paidProfileCompileClasspath,paidProfileRuntimeClasspath,paidProfileUnitTestCompileClasspath,paidProfileUnitTestRuntimeClasspath,paidReleaseCompileClasspath,paidReleaseRuntimeClasspath,paidReleaseUnitTestCompileClasspath,paidReleaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,freeDebugAndroidTestAnnotationProcessorClasspath,freeDebugAndroidTestRuntimeClasspath,freeDebugAnnotationProcessorClasspath,freeDebugReverseMetadataValues,freeDebugUnitTestAnnotationProcessorClasspath,freeDebugWearBundling,freeProfileAnnotationProcessorClasspath,freeProfileReverseMetadataValues,freeProfileUnitTestAnnotationProcessorClasspath,freeProfileWearBundling,freeReleaseAnnotationProcessorClasspath,freeReleaseReverseMetadataValues,freeReleaseUnitTestAnnotationProcessorClasspath,freeReleaseWearBundling,lintChecks,lintPublish,paidDebugAndroidTestAnnotationProcessorClasspath,paidDebugAndroidTestRuntimeClasspath,paidDebugAnnotationProcessorClasspath,paidDebugReverseMetadataValues,paidDebugUnitTestAnnotationProcessorClasspath,paidDebugWearBundling,paidProfileAnnotationProcessorClasspath,paidProfileReverseMetadataValues,paidProfileUnitTestAnnotationProcessorClasspath,paidProfileWearBundling,paidReleaseAnnotationProcessorClasspath,paidReleaseReverseMetadataValues,paidReleaseUnitTestAnnotationProcessorClasspath,paidReleaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,freeDebugAndroidTestAnnotationProcessorClasspath,freeDebugAndroidTestRuntimeClasspath,freeDebugAnnotationProcessorClasspath,freeDebugReverseMetadataValues,freeDebugUnitTestAnnotationProcessorClasspath,freeDebugWearBundling,freeProfileAnnotationProcessorClasspath,freeProfileReverseMetadataValues,freeProfileUnitTestAnnotationProcessorClasspath,freeProfileWearBundling,freeReleaseAnnotationProcessorClasspath,freeReleaseReverseMetadataValues,freeReleaseUnitTestAnnotationProcessorClasspath,freeReleaseWearBundling,lintChecks,lintPublish,paidDebugAndroidTestAnnotationProcessorClasspath,paidDebugAndroidTestRuntimeClasspath,paidDebugAnnotationProcessorClasspath,paidDebugReverseMetadataValues,paidDebugUnitTestAnnotationProcessorClasspath,paidDebugWearBundling,paidProfileAnnotationProcessorClasspath,paidProfileReverseMetadataValues,paidProfileUnitTestAnnotationProcessorClasspath,paidProfileWearBundling,paidReleaseAnnotationProcessorClasspath,paidReleaseReverseMetadataValues,paidReleaseUnitTestAnnotationProcessorClasspath,paidReleaseWearBundling
--- a/dev/integration_tests/flutter_gallery/android/build.gradle
+++ b/dev/integration_tests/flutter_gallery/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/flutter_gallery/android/project-app.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/project-app.lockfile
@@ -24,36 +24,37 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.android.exoplayer:exoplayer-common:2.12.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.android.exoplayer:exoplayer-core:2.12.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.android.exoplayer:exoplayer-dash:2.12.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
@@ -61,12 +62,11 @@ com.google.android.exoplayer:exoplayer-extractor:2.12.1=debugRuntimeClasspath,de
 com.google.android.exoplayer:exoplayer-hls:2.12.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.android.exoplayer:exoplayer-smoothstreaming:2.12.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -75,91 +75,44 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 junit:junit:4.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/flutter_gallery/android/project-connectivity.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/project-connectivity.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRu
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/flutter_gallery/android/project-device_info.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/project-device_info.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRu
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/flutter_gallery/android/project-integration_test.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/project-integration_test.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,90 +69,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/flutter_gallery/android/project-url_launcher.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/project-url_launcher.lockfile
@@ -24,46 +24,47 @@ androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroid
 backport-util-concurrent:backport-util-concurrent:3.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 classworlds:classworlds:1.1-alpha-2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.almworks.sqlite4java:sqlite4java:0.282=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.auto.service:auto-service:1.0-rc4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.auto:auto-common:0.8=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
 com.google.errorprone:error_prone_annotations:2.2.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:27.0.1-jre=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
@@ -74,34 +75,23 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.ibm.icu:icu4j:53.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.annotation:javax.annotation-api:1.3.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 javax.inject:javax.inject:1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
 nekohtml:nekohtml:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 nekohtml:xercesMinimal:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
 org.apache.ant:ant-launcher:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant:1.10.9=lintClassPath
 org.apache.ant:ant:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.commons:commons-compress:1.20=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
@@ -123,64 +113,32 @@ org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.52=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-qual:2.5.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
 org.codehaus.mojo:animal-sniffer-annotations:1.17=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.codehaus.plexus:plexus-interpolation:1.11=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.codehaus.plexus:plexus-utils:1.5.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
 org.mockito:mockito-core:1.10.19=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.objenesis:objenesis:2.1=debugUnitTestRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm-commons:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm-tree:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.ow2.asm:asm-util:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.robolectric:annotations:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.robolectric:junit:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.robolectric:pluginapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
@@ -192,7 +150,4 @@ org.robolectric:shadowapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntime
 org.robolectric:shadows-framework:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.robolectric:utils-reflector:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.robolectric:utils:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/flutter_gallery/android/project-video_player.lockfile
+++ b/dev/integration_tests/flutter_gallery/android/project-video_player.lockfile
@@ -19,36 +19,37 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRu
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.android.exoplayer:exoplayer-common:2.12.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.android.exoplayer:exoplayer-core:2.12.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.android.exoplayer:exoplayer-dash:2.12.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
@@ -56,11 +57,11 @@ com.google.android.exoplayer:exoplayer-extractor:2.12.1=debugAndroidTestCompileC
 com.google.android.exoplayer:exoplayer-hls:2.12.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.android.exoplayer:exoplayer-smoothstreaming:2.12.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:27.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -68,85 +69,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle
+++ b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/gradle_deprecated_settings/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/gradle_deprecated_settings/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/gradle_deprecated_settings/android/project-app.lockfile
+++ b/dev/integration_tests/gradle_deprecated_settings/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/gradle_deprecated_settings/android/project-camera.lockfile
+++ b/dev/integration_tests/gradle_deprecated_settings/android/project-camera.lockfile
@@ -17,185 +17,89 @@ androidx.lifecycle:lifecycle-runtime:2.2.0=debugAndroidTestCompileClasspath,debu
 androidx.lifecycle:lifecycle-viewmodel:2.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.test:core:1.3.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-androidx.test:monitor:1.3.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-backport-util-concurrent:backport-util-concurrent:3.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-classworlds:classworlds:1.1-alpha-2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.almworks.sqlite4java:sqlite4java:0.282=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
-com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.android:zipflinger:4.1.3=lintClassPath
-com.google.auto.service:auto-service:1.0-rc4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.auto:auto-common:0.8=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.code.findbugs:jsr305:3.0.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.errorprone:error_prone_annotations:2.2.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.guava:guava:28.1-jre=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
-com.google.guava:failureaccess:1.0.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.j2objc:j2objc-annotations:1.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
-com.google.protobuf:protobuf-java:2.6.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
-com.ibm.icu:icu4j:53.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
+javax.inject:javax.inject:1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-javax.annotation:javax.annotation-api:1.3.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-javax.inject:javax.inject:1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
 junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
+net.bytebuddy:byte-buddy-agent:1.10.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-nekohtml:nekohtml:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+net.bytebuddy:byte-buddy:1.10.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-nekohtml:xercesMinimal:1.9.6.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.11.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.bytebuddy:byte-buddy:1.11.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.ant:ant:1.8.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
-org.apache.maven.wagon:wagon-file:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven.wagon:wagon-http-shared:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven.wagon:wagon-provider-api:1.0-beta-6=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-ant-tasks:2.1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-artifact-manager:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-artifact:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-error-diagnostics:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-model:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-plugin-registry:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-profile:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-project:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-repository-metadata:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.maven:maven-settings:2.2.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
-org.bouncycastle:bcprov-jdk15on:1.52=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:2.5.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.plexus:plexus-interpolation:1.11=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.plexus:plexus-utils:1.5.15=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.hamcrest:hamcrest-library:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.mockito:mockito-core:3.5.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.objenesis:objenesis:3.1=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
+org.ow2.asm:asm-util:7.0=lintClassPath
-org.mockito:mockito-core:3.12.4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.ow2.asm:asm:7.0=lintClassPath
-org.mockito:mockito-inline:3.12.4=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-org.objenesis:objenesis:3.2=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm-util:7.0=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.ow2.asm:asm:7.0=androidJacocoAnt,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:annotations:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:junit:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:pluginapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:plugins-maven-dependency-resolver:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:resources:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:robolectric:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:sandbox:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:shadowapi:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:shadows-framework:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:utils-reflector:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.robolectric:utils:4.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.testng:testng:7.3.0=lintClassPath
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/hybrid_android_views/android/build.gradle
+++ b/dev/integration_tests/hybrid_android_views/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/hybrid_android_views/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/hybrid_android_views/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/hybrid_android_views/android/project-app.lockfile
+++ b/dev/integration_tests/hybrid_android_views/android/project-app.lockfile
@@ -19,43 +19,43 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -63,87 +63,39 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/hybrid_android_views/android/project-path_provider.lockfile
+++ b/dev/integration_tests/hybrid_android_views/android/project-path_provider.lockfile
@@ -19,43 +19,43 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRu
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -63,88 +63,41 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/module_host_with_custom_build_v2_embedding/build.gradle
+++ b/dev/integration_tests/module_host_with_custom_build_v2_embedding/build.gradle
@@ -8,7 +8,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
    }
 }

--- a/dev/integration_tests/module_host_with_custom_build_v2_embedding/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/module_host_with_custom_build_v2_embedding/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/non_nullable/android/build.gradle
+++ b/dev/integration_tests/non_nullable/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/non_nullable/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/non_nullable/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/non_nullable/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/non_nullable/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/non_nullable/android/project-app.lockfile
+++ b/dev/integration_tests/non_nullable/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenci
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,89 +62,47 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
 org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
--- a/dev/integration_tests/platform_interaction/android/build.gradle
+++ b/dev/integration_tests/platform_interaction/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/platform_interaction/android/project-app.lockfile
+++ b/dev/integration_tests/platform_interaction/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/release_smoke_test/android/build.gradle
+++ b/dev/integration_tests/release_smoke_test/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/release_smoke_test/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/release_smoke_test/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/release_smoke_test/android/project-app.lockfile
+++ b/dev/integration_tests/release_smoke_test/android/project-app.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,91 +69,44 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath
 junit:junit:4.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/release_smoke_test/android/project-integration_test.lockfile
+++ b/dev/integration_tests/release_smoke_test/android/project-integration_test.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,90 +69,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/ui/android/build.gradle
+++ b/dev/integration_tests/ui/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/integration_tests/ui/android/buildscript-gradle.lockfile
+++ b/dev/integration_tests/ui/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/integration_tests/ui/android/project-app.lockfile
+++ b/dev/integration_tests/ui/android/project-app.lockfile
@@ -24,44 +24,44 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:2.0.1=debugAndroidTestCompileClasspath
 com.google.code.findbugs:jsr305:3.0.2=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -70,90 +70,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/dev/integration_tests/ui/android/project-integration_test.lockfile
+++ b/dev/integration_tests/ui/android/project-integration_test.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,90 +69,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/manual_tests/android/build.gradle
+++ b/dev/manual_tests/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/dev/manual_tests/android/buildscript-gradle.lockfile
+++ b/dev/manual_tests/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/dev/manual_tests/android/project-app.lockfile
+++ b/dev/manual_tests/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenci
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,89 +62,47 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
 org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
 org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compile,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompile,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestImplementationDependenciesMetadata,androidTestProfileApiDependenciesMetadata,androidTestProfileCompileOnlyDependenciesMetadata,androidTestProfileImplementationDependenciesMetadata,androidTestProfileRuntimeOnlyDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,apiDependenciesMetadata,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompile,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntime,debugAndroidTestRuntimeClasspath,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompile,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugReverseMetadataValues,debugRuntime,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompile,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestRuntime,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileCompile,profileCompileOnly,profileCompileOnlyDependenciesMetadata,profileReverseMetadataValues,profileRuntime,profileRuntimeOnlyDependenciesMetadata,profileUnitTestAnnotationProcessorClasspath,profileUnitTestApiDependenciesMetadata,profileUnitTestCompile,profileUnitTestCompileOnlyDependenciesMetadata,profileUnitTestImplementationDependenciesMetadata,profileUnitTestRuntime,profileUnitTestRuntimeOnlyDependenciesMetadata,profileWearBundling,releaseAnnotationProcessorClasspath,releaseCompile,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseReverseMetadataValues,releaseRuntime,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompile,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestRuntime,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testProfileApiDependenciesMetadata,testProfileCompileOnlyDependenciesMetadata,testProfileImplementationDependenciesMetadata,testProfileRuntimeOnlyDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
--- a/examples/api/android/build.gradle
+++ b/examples/api/android/build.gradle
@@ -10,7 +10,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }

--- a/examples/api/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/api/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/examples/flutter_view/android/build.gradle
+++ b/examples/flutter_view/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/examples/flutter_view/android/buildscript-gradle.lockfile
+++ b/examples/flutter_view/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/examples/flutter_view/android/project-app.lockfile
+++ b/examples/flutter_view/android/project-app.lockfile
@@ -38,42 +38,43 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0=debugAndroidTestCompileCla
 androidx.vectordrawable:vectordrawable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.android.material:material:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -81,85 +82,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/examples/hello_world/android/build.gradle
+++ b/examples/hello_world/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/examples/hello_world/android/buildscript-gradle.lockfile
+++ b/examples/hello_world/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/examples/hello_world/android/project-app.lockfile
+++ b/examples/hello_world/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/examples/image_list/android/build.gradle
+++ b/examples/image_list/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/examples/image_list/android/buildscript-gradle.lockfile
+++ b/examples/image_list/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/examples/image_list/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/image_list/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/examples/image_list/android/project-app.lockfile
+++ b/examples/image_list/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/examples/layers/android/build.gradle
+++ b/examples/layers/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/examples/layers/android/buildscript-gradle.lockfile
+++ b/examples/layers/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/examples/layers/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/layers/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/examples/layers/android/project-app.lockfile
+++ b/examples/layers/android/project-app.lockfile
@@ -19,41 +19,42 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugCompileClassp
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,85 +62,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/examples/platform_channel/android/build.gradle
+++ b/examples/platform_channel/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/examples/platform_channel/android/buildscript-gradle.lockfile
+++ b/examples/platform_channel/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/examples/platform_channel/android/project-app.lockfile
+++ b/examples/platform_channel/android/project-app.lockfile
@@ -23,42 +23,43 @@ androidx.test:monitor:1.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRun
 androidx.test:runner:1.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:2.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -67,89 +68,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath
 junit:junit:4.13=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/examples/platform_view/android/build.gradle
+++ b/examples/platform_view/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/examples/platform_view/android/buildscript-gradle.lockfile
+++ b/examples/platform_view/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/examples/platform_view/android/project-app.lockfile
+++ b/examples/platform_view/android/project-app.lockfile
@@ -38,42 +38,43 @@ androidx.vectordrawable:vectordrawable-animated:1.1.0=debugAndroidTestCompileCla
 androidx.vectordrawable:vectordrawable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.android.material:material:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -81,85 +82,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=lintClassPath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/packages/flutter_tools/lib/src/android/gradle_utils.dart
+++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart
@@ -19,7 +19,7 @@ import '../project.dart';
 import '../reporting/reporting.dart';
 import 'android_sdk.dart';
-const String _defaultGradleVersion = '7.0.2';
+const String _defaultGradleVersion = '6.7';
 final RegExp _androidPluginRegExp = RegExp(r'com\.android\.tools\.build:gradle:(\d+\.\d+\.\d+)');
@@ -182,9 +182,6 @@ String getGradleVersionFor(String androidPluginVersion) {
  if (_isWithinVersionRange(androidPluginVersion, min: '4.0.0', max: '4.1.0')) {
    return '6.7';
  }
-  if (_isWithinVersionRange(androidPluginVersion, min: '7.0.0', max: '7.0.1')) {
-    return '7.0.2';
-  }
  throwToolExit('Unsupported Android Plugin version: $androidPluginVersion.');
 }

--- a/packages/flutter_tools/templates/app_shared/android-java.tmpl/build.gradle
+++ b/packages/flutter_tools/templates/app_shared/android-java.tmpl/build.gradle
@@ -5,7 +5,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
    }
 }

--- a/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
+++ b/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
@@ -6,7 +6,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }

--- a/packages/flutter_tools/templates/app_shared/android.tmpl/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/flutter_tools/templates/app_shared/android.tmpl/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/packages/flutter_tools/templates/module/android/gradle/build.gradle.copy.tmpl
+++ b/packages/flutter_tools/templates/module/android/gradle/build.gradle.copy.tmpl
@@ -7,7 +7,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
    }
 }

--- a/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
+++ b/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
@@ -8,7 +8,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
    }
 }

--- a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
+++ b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
@@ -9,7 +9,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }

--- a/packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart
@@ -329,7 +329,7 @@ void main() {
        'gradle',
        label: 'gradle-expected-file-not-found',
        parameters: CustomDimensions.fromMap(<String, String> {
-          'cd37': 'androidGradlePluginVersion: 7.0.2, fileExtension: .aab',
+          'cd37': 'androidGradlePluginVersion: 6.7, fileExtension: .aab',
        }),
      ),
    ));

--- a/packages/flutter_tools/test/general.shard/android/gradle_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart
@@ -451,8 +451,6 @@ flutter:
      expect(getGradleVersionFor('4.0.0'), '6.7');
      expect(getGradleVersionFor('4.1.0'), '6.7');
-      expect(getGradleVersionFor('7.0.1'), '7.0.2');
    });
    testWithoutContext('throws on unsupported versions', () {

--- a/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart
@@ -73,7 +73,7 @@ void main() {
            'distributionPath=wrapper/dists\n'
            'zipStoreBase=GRADLE_USER_HOME\n'
            'zipStorePath=wrapper/dists\n'
-            'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0.2-all.zip\n');
+            'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.7-all.zip\n');
    });
    testWithoutContext('injects the wrapper when some files are missing', () {
@@ -110,7 +110,7 @@ void main() {
          'distributionPath=wrapper/dists\n'
          'zipStoreBase=GRADLE_USER_HOME\n'
          'zipStorePath=wrapper/dists\n'
-          'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0.2-all.zip\n');
+          'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.7-all.zip\n');
    });
    testWithoutContext('injects the wrapper and the Gradle version is derivated from the AGP version', () {
@@ -129,7 +129,6 @@ void main() {
        '4.0.0': '6.7',
        '4.0.5': '6.7',
        '4.1.0': '6.7',
-        '7.0.1': '7.0.2',
      };
      for (final MapEntry<String, String> entry in testCases.entries) {

--- a/packages/integration_test/android/build.gradle
+++ b/packages/integration_test/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
    }
 }

--- a/packages/integration_test/example/android/build.gradle
+++ b/packages/integration_test/example/android/build.gradle
@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }

--- a/packages/integration_test/example/android/buildscript-gradle.lockfile
+++ b/packages/integration_test/example/android/buildscript-gradle.lockfile
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-androidx.databinding:databinding-common:7.0.1=classpath
+androidx.databinding:databinding-common:4.1.3=classpath
-androidx.databinding:databinding-compiler-common:7.0.1=classpath
+androidx.databinding:databinding-compiler-common:4.1.3=classpath
-com.android.databinding:baseLibrary:7.0.1=classpath
+com.android.databinding:baseLibrary:4.1.3=classpath
-com.android.tools.analytics-library:crash:30.0.1=classpath
+com.android.tools.analytics-library:crash:27.1.3=classpath
-com.android.tools.analytics-library:protos:30.0.1=classpath
+com.android.tools.analytics-library:protos:27.1.3=classpath
-com.android.tools.analytics-library:shared:30.0.1=classpath
+com.android.tools.analytics-library:shared:27.1.3=classpath
-com.android.tools.analytics-library:tracker:30.0.1=classpath
+com.android.tools.analytics-library:tracker:27.1.3=classpath
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
-com.android.tools.build:aapt2-proto:7.0.1-7396180=classpath
+com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
-com.android.tools.build:aaptcompiler:7.0.1=classpath
+com.android.tools.build:aaptcompiler:4.1.3=classpath
-com.android.tools.build:apksig:7.0.1=classpath
+com.android.tools.build:apksig:4.1.3=classpath
-com.android.tools.build:apkzlib:7.0.1=classpath
+com.android.tools.build:apkzlib:4.1.3=classpath
-com.android.tools.build:builder-model:7.0.1=classpath
+com.android.tools.build:builder-model:4.1.3=classpath
-com.android.tools.build:builder-test-api:7.0.1=classpath
+com.android.tools.build:builder-test-api:4.1.3=classpath
-com.android.tools.build:builder:7.0.1=classpath
+com.android.tools.build:builder:4.1.3=classpath
-com.android.tools.build:bundletool:1.6.0=classpath
+com.android.tools.build:bundletool:0.14.0=classpath
-com.android.tools.build:gradle-api:7.0.1=classpath
+com.android.tools.build:gradle-api:4.1.3=classpath
-com.android.tools.build:gradle:7.0.1=classpath
+com.android.tools.build:gradle:4.1.3=classpath
-com.android.tools.build:manifest-merger:30.0.1=classpath
+com.android.tools.build:manifest-merger:27.1.3=classpath
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
-com.android.tools.ddms:ddmlib:30.0.1=classpath
+com.android.tools.ddms:ddmlib:27.1.3=classpath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=classpath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
-com.android.tools.lint:lint-model:30.0.1=classpath
+com.android.tools.lint:lint-gradle-api:27.1.3=classpath
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.1=classpath
+com.android.tools.lint:lint-model:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.1=classpath
+com.android.tools:annotations:27.1.3=classpath
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.1=classpath
+com.android.tools:common:27.1.3=classpath
-com.android.tools:annotations:30.0.1=classpath
+com.android.tools:dvlib:27.1.3=classpath
-com.android.tools:common:30.0.1=classpath
+com.android.tools:repository:27.1.3=classpath
-com.android.tools:dvlib:30.0.1=classpath
+com.android.tools:sdk-common:27.1.3=classpath
-com.android.tools:repository:30.0.1=classpath
+com.android.tools:sdklib:27.1.3=classpath
-com.android.tools:sdk-common:30.0.1=classpath
+com.android:signflinger:4.1.3=classpath
-com.android.tools:sdklib:30.0.1=classpath
+com.android:zipflinger:4.1.3=classpath
-com.android:signflinger:7.0.1=classpath
-com.android:zipflinger:7.0.1=classpath
 com.github.gundy:semver4j:0.16.4=classpath
-com.google.android:annotations:4.1.1.4=classpath
-com.google.api.grpc:proto-google-common-protos:1.12.0=classpath
 com.google.auto.value:auto-value-annotations:1.6.2=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.8.6=classpath
 com.google.crypto.tink:tink:1.3.0-rc2=classpath
-com.google.dagger:dagger:2.28.3=classpath
+com.google.errorprone:error_prone_annotations:2.3.2=classpath
-com.google.errorprone:error_prone_annotations:2.3.4=classpath
 com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
 com.google.guava:failureaccess:1.0.1=classpath
-com.google.guava:guava:30.1-jre=classpath
+com.google.guava:guava:28.1-jre=classpath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
 com.google.j2objc:j2objc-annotations:1.3=classpath
 com.google.jimfs:jimfs:1.1=classpath
 com.google.protobuf:protobuf-java-util:3.10.0=classpath
 com.google.protobuf:protobuf-java:3.10.0=classpath
-com.google.testing.platform:core-proto:0.0.8-alpha04=classpath
+com.google.test.platform:core-proto:0.0.2-dev=classpath
 com.googlecode.json-simple:json-simple:1.1=classpath
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
 com.squareup:javapoet:1.10.0=classpath
 com.squareup:javawriter:2.5.0=classpath
 com.sun.activation:javax.activation:1.2.0=classpath
-com.sun.istack:istack-commons-runtime:3.0.8=classpath
+com.sun.istack:istack-commons-runtime:3.0.7=classpath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
 commons-codec:commons-codec:1.10=classpath
 commons-io:commons-io:2.4=classpath
 commons-logging:commons-logging:1.2=classpath
 de.undercouch:gradle-download-task:4.0.2=classpath
-io.grpc:grpc-api:1.21.1=classpath
+it.unimi.dsi:fastutil:7.2.0=classpath
-io.grpc:grpc-context:1.21.1=classpath
+javax.activation:javax.activation-api:1.2.0=classpath
-io.grpc:grpc-core:1.21.1=classpath
-io.grpc:grpc-netty:1.21.1=classpath
-io.grpc:grpc-protobuf-lite:1.21.1=classpath
-io.grpc:grpc-protobuf:1.21.1=classpath
-io.grpc:grpc-stub:1.21.1=classpath
-io.netty:netty-buffer:4.1.34.Final=classpath
-io.netty:netty-codec-http2:4.1.34.Final=classpath
-io.netty:netty-codec-http:4.1.34.Final=classpath
-io.netty:netty-codec-socks:4.1.34.Final=classpath
-io.netty:netty-codec:4.1.34.Final=classpath
-io.netty:netty-common:4.1.34.Final=classpath
-io.netty:netty-handler-proxy:4.1.34.Final=classpath
-io.netty:netty-handler:4.1.34.Final=classpath
-io.netty:netty-resolver:4.1.34.Final=classpath
-io.netty:netty-transport:4.1.34.Final=classpath
-io.opencensus:opencensus-api:0.21.0=classpath
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath
-it.unimi.dsi:fastutil:8.4.0=classpath
-jakarta.activation:jakarta.activation-api:1.2.1=classpath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
 javax.inject:javax.inject:1=classpath
-net.java.dev.jna:jna-platform:5.6.0=classpath
+javax.xml.bind:jaxb-api:2.3.1=classpath
-net.java.dev.jna:jna:5.6.0=classpath
 net.sf.jopt-simple:jopt-simple:4.9=classpath
 net.sf.kxml:kxml2:2.3.0=classpath
+net.sf.proguard:proguard-base:6.0.3=classpath
+net.sf.proguard:proguard-gradle:6.0.3=classpath
 org.antlr:antlr4-runtime:4.5.2-1=classpath
 org.antlr:antlr4:4.5.3=classpath
-org.apache.commons:commons-compress:1.20=classpath
+org.apache.commons:commons-compress:1.12=classpath
 org.apache.httpcomponents:httpclient:4.5.6=classpath
 org.apache.httpcomponents:httpcore:4.4.10=classpath
 org.apache.httpcomponents:httpmime:4.5.6=classpath
 org.bouncycastle:bcpkix-jdk15on:1.56=classpath
 org.bouncycastle:bcprov-jdk15on:1.56=classpath
-org.checkerframework:checker-qual:3.5.0=classpath
+org.checkerframework:checker-qual:2.8.1=classpath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=classpath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
-org.glassfish.jaxb:txw2:2.3.2=classpath
+org.glassfish.jaxb:txw2:2.3.1=classpath
 org.jdom:jdom2:2.0.6=classpath
 org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.32=classpath
@@ -123,21 +99,20 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-io:1.4.32=classpath
 org.jetbrains.kotlin:kotlin-util-klib:1.4.32=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=classpath
+org.jetbrains.trove4j:trove4j:20160824=classpath
 org.jetbrains:annotations:13.0=classpath
 org.json:json:20180813=classpath
-org.jvnet.staxex:stax-ex:1.8.1=classpath
+org.jvnet.staxex:stax-ex:1.8=classpath
 org.ow2.asm:asm-analysis:7.0=classpath
 org.ow2.asm:asm-commons:7.0=classpath
 org.ow2.asm:asm-tree:7.0=classpath
 org.ow2.asm:asm-util:7.0=classpath
 org.ow2.asm:asm:7.0=classpath
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
-xerces:xercesImpl:2.12.0=classpath
-xml-apis:xml-apis:1.4.01=classpath
 empty=
--- a/packages/integration_test/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/integration_test/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
--- a/packages/integration_test/example/android/project-app.lockfile
+++ b/packages/integration_test/example/android/project-app.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,90 +69,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileReverseMetadataValues,profileUnitTestAnnotationProcessorClasspath,profileWearBundling,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
--- a/packages/integration_test/example/android/project-integration_test.lockfile
+++ b/packages/integration_test/example/android/project-integration_test.lockfile
@@ -24,43 +24,43 @@ androidx.test:rules:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRunti
 androidx.test:runner:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.3.2=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
 com.google.guava:failureaccess:1.0.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.guava:guava:28.1-android=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -69,90 +69,43 @@ com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.1.1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
 junit:junit:4.12=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
 org.checkerframework:checker-compat-qual:2.5.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.codehaus.mojo:animal-sniffer-annotations:1.18=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-integration:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 org.hamcrest:hamcrest-library:1.3=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath
--- a/dev/integration_tests/gradle_deprecated_settings/android/project-flutter_plugin_android_lifecycle.lockfile
+++ b/dev/integration_tests/gradle_deprecated_settings/android/project-flutter_plugin_android_lifecycle.lockfile
@@ -19,41 +19,43 @@ androidx.loader:loader:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRu
 androidx.savedstate:savedstate:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.versionedparcelable:versionedparcelable:1.1.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
 androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:protos:30.0.1=lintClassPath
+androidx.webkit:webkit:1.0.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-com.android.tools.analytics-library:shared:30.0.1=lintClassPath
+com.android.tools.analytics-library:protos:27.1.3=lintClassPath
-com.android.tools.analytics-library:tracker:30.0.1=lintClassPath
+com.android.tools.analytics-library:shared:27.1.3=lintClassPath
+com.android.tools.analytics-library:tracker:27.1.3=lintClassPath
 com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
-com.android.tools.build:apksig:7.0.1=lintClassPath
+com.android.tools.build:aapt2:4.1.3-6503028=_internal_aapt2_binary
-com.android.tools.build:apkzlib:7.0.1=lintClassPath
+com.android.tools.build:apksig:4.1.3=lintClassPath
-com.android.tools.build:builder-model:7.0.1=lintClassPath
+com.android.tools.build:apkzlib:4.1.3=lintClassPath
-com.android.tools.build:builder-test-api:7.0.1=lintClassPath
+com.android.tools.build:builder-model:4.1.3=lintClassPath
-com.android.tools.build:builder:7.0.1=lintClassPath
+com.android.tools.build:builder-test-api:4.1.3=lintClassPath
-com.android.tools.build:manifest-merger:30.0.1=lintClassPath
+com.android.tools.build:builder:4.1.3=lintClassPath
-com.android.tools.ddms:ddmlib:30.0.1=lintClassPath
+com.android.tools.build:gradle-api:4.1.3=lintClassPath
-com.android.tools.external.com-intellij:intellij-core:30.0.1=lintClassPath
+com.android.tools.build:manifest-merger:27.1.3=lintClassPath
-com.android.tools.external.com-intellij:kotlin-compiler:30.0.1=lintClassPath
+com.android.tools.ddms:ddmlib:27.1.3=lintClassPath
-com.android.tools.external.org-jetbrains:uast:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath
-com.android.tools.layoutlib:layoutlib-api:30.0.1=lintClassPath
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath
-com.android.tools.lint:lint-api:30.0.1=lintClassPath
+com.android.tools.external.org-jetbrains:uast:27.1.3=lintClassPath
-com.android.tools.lint:lint-checks:30.0.1=lintClassPath
+com.android.tools.layoutlib:layoutlib-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-gradle:30.0.1=lintClassPath
+com.android.tools.lint:lint-api:27.1.3=lintClassPath
-com.android.tools.lint:lint-model:30.0.1=lintClassPath
+com.android.tools.lint:lint-checks:27.1.3=lintClassPath
-com.android.tools.lint:lint:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath
-com.android.tools:annotations:30.0.1=lintClassPath
+com.android.tools.lint:lint-gradle:27.1.3=lintClassPath
-com.android.tools:common:30.0.1=lintClassPath
+com.android.tools.lint:lint-model:27.1.3=lintClassPath
-com.android.tools:dvlib:30.0.1=lintClassPath
+com.android.tools.lint:lint:27.1.3=lintClassPath
-com.android.tools:repository:30.0.1=lintClassPath
+com.android.tools:annotations:27.1.3=lintClassPath
-com.android.tools:sdk-common:30.0.1=lintClassPath
+com.android.tools:common:27.1.3=lintClassPath
-com.android.tools:sdklib:30.0.1=lintClassPath
+com.android.tools:dvlib:27.1.3=lintClassPath
-com.android:signflinger:7.0.1=lintClassPath
+com.android.tools:repository:27.1.3=lintClassPath
-com.android:zipflinger:7.0.1=lintClassPath
+com.android.tools:sdk-common:27.1.3=lintClassPath
-com.beust:jcommander:1.78=lintClassPath
+com.android.tools:sdklib:27.1.3=lintClassPath
-com.github.javaparser:javaparser-core:3.17.0=lintClassPath
+com.android:signflinger:4.1.3=lintClassPath
+com.android:zipflinger:4.1.3=lintClassPath
 com.google.code.findbugs:jsr305:3.0.2=lintClassPath
-com.google.code.gson:gson:2.8.6=lintClassPath
+com.google.code.gson:gson:2.8.5=lintClassPath
-com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
+com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
 com.google.guava:failureaccess:1.0.1=lintClassPath
-com.google.guava:guava:30.1-jre=lintClassPath
+com.google.guava:guava:28.1-jre=lintClassPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
 com.google.j2objc:j2objc-annotations:1.3=lintClassPath
 com.google.jimfs:jimfs:1.1=lintClassPath
@@ -61,88 +63,38 @@ com.google.protobuf:protobuf-java:3.10.0=lintClassPath
 com.googlecode.json-simple:json-simple:1.1=lintClassPath
 com.squareup:javawriter:2.5.0=lintClassPath
 com.sun.activation:javax.activation:1.2.0=lintClassPath
-com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
+com.sun.istack:istack-commons-runtime:3.0.7=lintClassPath
-com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
+com.sun.xml.fastinfoset:FastInfoset:1.2.15=lintClassPath
-com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
 commons-codec:commons-codec:1.10=lintClassPath
-commons-io:commons-io:2.4=lintClassPath
 commons-logging:commons-logging:1.2=lintClassPath
-info.picocli:picocli:4.5.2=lintClassPath
+it.unimi.dsi:fastutil:7.2.0=lintClassPath
-it.unimi.dsi:fastutil:8.4.0=lintClassPath
+javax.activation:javax.activation-api:1.2.0=lintClassPath
-jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
 javax.inject:javax.inject:1=lintClassPath
-jline:jline:2.14.6=lintClassPath
+javax.xml.bind:jaxb-api:2.3.1=lintClassPath
-junit:junit:4.12=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-junit:junit:4.13.1=lintClassPath
-net.java.dev.jna:jna-platform:5.6.0=lintClassPath
-net.java.dev.jna:jna:5.6.0=lintClassPath
 net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
 net.sf.kxml:kxml2:2.3.0=lintClassPath
-org.apache.ant:ant-antlr:1.10.9=lintClassPath
+org.apache.commons:commons-compress:1.12=lintClassPath
-org.apache.ant:ant-junit:1.10.9=lintClassPath
-org.apache.ant:ant-launcher:1.10.9=lintClassPath
-org.apache.ant:ant:1.10.9=lintClassPath
-org.apache.commons:commons-compress:1.20=lintClassPath
 org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
 org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
 org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
 org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
 org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
-org.checkerframework:checker-qual:3.5.0=lintClassPath
+org.checkerframework:checker-qual:2.8.1=lintClassPath
-org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
+org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
-org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
+org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
-org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
+org.glassfish.jaxb:jaxb-runtime:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
+org.glassfish.jaxb:txw2:2.3.1=lintClassPath
-org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
+org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath
-org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
+org.jetbrains.trove4j:trove4j:20160824=lintClassPath
-org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
-org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
-org.codehaus.groovy:groovy:3.0.7=lintClassPath
-org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
-org.glassfish.jaxb:txw2:2.3.2=lintClassPath
-org.hamcrest:hamcrest-core:1.3=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
-org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
-org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
-org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
 org.jetbrains:annotations:13.0=lintClassPath
-org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
+org.jvnet.staxex:stax-ex:1.8=lintClassPath
-org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
+org.ow2.asm:asm-analysis:7.0=lintClassPath
-org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
+org.ow2.asm:asm-commons:7.0=lintClassPath
-org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
+org.ow2.asm:asm-tree:7.0=lintClassPath
-org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
-org.junit:junit-bom:5.7.0=lintClassPath
-org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
-org.mockito:mockito-core:1.10.19=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
-org.objenesis:objenesis:2.1=debugUnitTestRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=lintClassPath
-org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
-org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
 org.ow2.asm:asm-util:7.0=lintClassPath
-org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
+org.ow2.asm:asm:7.0=lintClassPath
-org.testng:testng:7.3.0=lintClassPath
+empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath,testCompile
-xerces:xercesImpl:2.12.0=lintClassPath
-xml-apis:xml-apis:1.4.01=lintClassPath
-empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAnnotationProcessorClasspath,debugUnitTestAnnotationProcessorClasspath,lintChecks,lintPublish,profileAnnotationProcessorClasspath,profileUnitTestAnnotationProcessorClasspath,releaseAnnotationProcessorClasspath,releaseUnitTestAnnotationProcessorClasspath