Merge 5b1d4d20f3e3cf62d6c75edd41ac0477fdbacf1a on remote branch

Change-Id: Ib005af38fc295e1937deb9cad7270b54f3478e98
diff --git a/Android.bp b/Android.bp
index 061cb62..3cdbd00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,23 @@
 
 
 
+package {
+    default_applicable_licenses: ["external_rust_crates_ciborium_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_rust_crates_ciborium_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 rust_library {
     name: "libciborium",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..2f7de78
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,13 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "libcert_request_validator_tests"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libcert_request_validator_tests"
+    }
+  ]
+}