Merge "Remove unnecessary references to libunwind."
diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 8ce9dfc..1b13b21 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -232,7 +232,7 @@
     {"shutdown,thermal,battery", 87},
     {"reboot,its_just_so_hard", 88},  // produced by boot_reason_test
     {"reboot,Its Just So Hard", 89},  // produced by boot_reason_test
-    // {"usb", 90},  // Duplicate of enum 80 above. Immediate reuse possible.
+    {"reboot,rescueparty", 90},
     {"charge", 91},
     {"oem_tz_crash", 92},
     {"uvlo", 93},
diff --git a/demangle/Android.bp b/demangle/Android.bp
index f3b4aa0..cf6abfd 100644
--- a/demangle/Android.bp
+++ b/demangle/Android.bp
@@ -80,4 +80,7 @@
     ],
 
     test_suites: ["device-tests"],
+    required: [
+        "libdemangle",
+    ],
 }
diff --git a/healthd/OWNERS b/healthd/OWNERS
index 2375f7c..00df08a 100644
--- a/healthd/OWNERS
+++ b/healthd/OWNERS
@@ -1 +1,2 @@
+elsk@google.com
 toddpoynor@google.com
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index b518630..11b8144 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -184,6 +184,9 @@
         "testdata/x86/*",
         "testdata/x86_64/*",
     ],
+    required: [
+        "libbacktrace_test",
+    ],
 }
 
 cc_benchmark {