Add Keymaster 4.1

Bug: 140193672
Bug: 140192237
Bug: 140824829
Test: hidl_implementation_test:hidl_implementation_test.Hidl#InterfacesImplemented
Change-Id: I744df2e1ec9649f3c26bb50e6f615ee825744562
diff --git a/CleanSpec.mk b/CleanSpec.mk
index a3eb81c..b72c9d0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -54,3 +54,6 @@
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/[email protected])
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/[email protected])
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/[email protected])
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/[email protected])
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 35fed01..be86d7f 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -186,7 +186,7 @@
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
-        <version>4.0</version>
+        <version>4.1</version>
         <interface>
             <name>IKeymasterDevice</name>
             <instance>default</instance>
diff --git a/shared/device.mk b/shared/device.mk
index 26ba978..f8cfd67 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -301,8 +301,7 @@
 # Keymaster HAL
 #
 PRODUCT_PACKAGES += \
-     [email protected] \
-     [email protected]
+     [email protected]
 
 #
 # Power HAL