Merge RP1A.200221.003

Change-Id: I178c97e84e42c5ac90c745662d793334f9776076
diff --git a/iface_fuzzer/Android.bp b/iface_fuzzer/Android.bp
index 5d1f842..a93d564 100644
--- a/iface_fuzzer/Android.bp
+++ b/iface_fuzzer/Android.bp
@@ -57,8 +57,14 @@
     ],
     fuzz_config: {
         // This fuzz target must be run against HAL implementation, which are
-        // only present on the device.
+        // only present on the device. These are disabled for until Haiku has 
+        // improved support for fuzzing HAL services.
+        fuzz_on_haiku_device: false,
         fuzz_on_haiku_host: false,
+        cc: [
+            "smoreland@google.com",
+            "trong@google.com",
+        ],
     },
 }