Merge SP1A.210222.001

Change-Id: I4238d755cd04f41ec63c2919d8d08e7eceebebd6

Android.bp

+package {
+    default_applicable_licenses: ["external_tinyxml2_license"],
+}
+
+license {
+    name: "external_tinyxml2_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Zlib",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE.txt",
+        "NOTICE",
+    ],
+}
+
+// The jquery stuff in docs/ is a bit ambiguous with its use of and/or when talking about the GPL,
+// so let's just make it clear that we don't use any of that stuff anyway...
+license {
+    name: "external_tinyxml2_docs_license",
+    license_kinds: ["SPDX-license-identifier-GPL"],
+    license_text: [
+        "LICENSE.txt",
+        "NOTICE",
+    ],
+}
+// ...and prevent anyone from trying to do so:
+filegroup {
+    name: "external_tinyxml2_docs",
+    srcs: ["docs/**/*"],
+    visibility: ["//visibility:private"],
+}
+
 cc_library {
     name: "libtinyxml2",
     host_supported: true,