Merge changes Ifba05b57,Idd0f35fc

* changes:
  libkeystore-wifi-hidl: Updated to vendor_available:true
  libkeystore-wifi-hidl: Updated Android.bp
diff --git a/keystore/Android.bp b/keystore/Android.bp
index 0f2000c..b59bacc 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -87,7 +87,7 @@
 }
 
 // Library for keystore clients using the WiFi HIDL interface
-cc_library_shared {
+cc_library {
     name: "libkeystore-wifi-hidl",
     defaults: ["keystore_defaults"],
 
@@ -102,5 +102,5 @@
 
     export_include_dirs: ["include"],
 
-    vendor: true,
+    vendor_available: true,
 }