Merge Android 12

Bug: 202323961
Merged-In: I9494082d36af92b66ff4fc7551d3659b9b51d8ea
Change-Id: I4400018adf807b723c48b5fe7c651ac6178ca2ac
diff --git a/builder/MODULE_LICENSE_APACHE2 b/builder/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/builder/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/gradle/MODULE_LICENSE_APACHE2 b/gradle/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/gradle/MODULE_LICENSE_APACHE2
+++ /dev/null