Snap for 7183507 from 2188055b689f093e1e3a439a935cda2f2f44ab42 to sdk-release

Change-Id: Ifb689e1d9e477350524d8349591843359463cb53
diff --git a/Android.bp b/Android.bp
index 4cf532b..e99d7e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,41 @@
 // This file is generated by cargo2android.py --device --run --dependencies.
 
+package {
+    default_applicable_licenses: ["external_rust_crates_smallvec_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.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+    name: "external_rust_crates_smallvec_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE-APACHE",
+        "LICENSE-MIT",
+    ],
+}
+
 rust_library {
     name: "libsmallvec",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5058d5e..33c9578 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,10 +2,6 @@
 {
   "presubmit": [
     {
-      "host": true,
-      "name": "parking_lot_core_host_test_src_lib"
-    },
-    {
       "name": "parking_lot_core_device_test_src_lib"
     }
   ]