Snap for 5053735 from 8727437f6ef53d7841c5413610f07e6d70015017 to qt-release

Change-Id: I4490b7e79f3d6d725dd583dac5afcb3935e91f5c
diff --git a/src/quipper/Android.bp b/src/quipper/Android.bp
index 921f0de..6aea508 100644
--- a/src/quipper/Android.bp
+++ b/src/quipper/Android.bp
@@ -29,6 +29,7 @@
 
 cc_defaults {
     name: "libquipper_defaults",
+    defaults: ["libsimpleperf_elf_read_static_reqs_defaults"],
 
     cflags: [
         "-Wno-unused",
@@ -127,6 +128,7 @@
 
 cc_defaults {
     name: "quipper_test_defaults",
+    defaults: ["libsimpleperf_elf_read_static_reqs_defaults"],
     host_supported: true,
     srcs: [
         // Independent test infra.
@@ -208,6 +210,7 @@
     ],
     shared_libs: [
         "libbase",
+        "liblog",
         "libprotobuf-cpp-full",
     ],