Merge "Revert "pixel3_maineline: Add changes to get pixel3_mainline building a boot.img"" am: 4d4e2fb0c1 am: 6b6297b6d2 am: f009466b95

Change-Id: I586cf6ddda1716052605aca6148c8a8f0f5f60bd
diff --git a/manifest.xml b/manifest.xml
index d2d3477..1375db4 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -98,24 +98,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.wifi.hostapd</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IHostapd</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
         <version>3.0</version>