Snap for 4375922 from a3a540c05aad886b4357765f092b8a6303977551 to pi-release

Change-Id: I9e4478f835db008c62b5dfffe74e2299c87f2517
diff --git a/wifi/keystore/1.0/Android.bp b/wifi/keystore/1.0/Android.bp
index 97d2815..5394760 100644
--- a/wifi/keystore/1.0/Android.bp
+++ b/wifi/keystore/1.0/Android.bp
@@ -124,6 +124,7 @@
 
 cc_test {
     name: "android.system.wifi.keystore@1.0-adapter",
+    defaults: ["hidl-module-defaults"],
     shared_libs: [
         "libhidladapter",
         "libhidlbase",
@@ -132,6 +133,5 @@
         "android.system.wifi.keystore@1.0",
         "android.system.wifi.keystore@1.0-adapter-helper",
     ],
-    cflags: ["-Wall", "-Werror"],
     generated_sources: ["android.system.wifi.keystore@1.0-adapter_genc++"],
 }