Revert "resolve merge conflicts of a260b85 to stage-aosp-master" am: f20322560e
am: 819c7f83e3

Change-Id: Ia19a8df6360064a791a355c9f0cceb062668165f
diff --git a/wifi/keystore/1.0/Android.bp b/wifi/keystore/1.0/Android.bp
index 0bed025..bf486f5 100644
--- a/wifi/keystore/1.0/Android.bp
+++ b/wifi/keystore/1.0/Android.bp
@@ -37,6 +37,7 @@
 
 cc_library_shared {
     name: "android.system.wifi.keystore@1.0",
+    defaults: ["hidl-module-defaults"],
     generated_sources: ["android.system.wifi.keystore@1.0_genc++"],
     generated_headers: ["android.system.wifi.keystore@1.0_genc++_headers"],
     export_generated_headers: ["android.system.wifi.keystore@1.0_genc++_headers"],