Snap for 8426163 from abb3a16c4986c5f7dda62580c4f53c1930d4d1b9 to mainline-tzdata2-release

Change-Id: I02e415ca69b945dbef6e124d58997d40c79a8007
diff --git a/Android.bp b/Android.bp
index 68cf8ae..8a7a686 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,36 +14,6 @@
 // limitations under the License.
 //
 
-package {
-    default_applicable_licenses: ["external_libdivsufsort_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "external_libdivsufsort_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-MIT",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_defaults {
     name: "libdivsufsort_defaults",
     host_supported: true,
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..7a694c9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE
\ No newline at end of file