Merge changes I1b6bd84e,I847db96b am: 132b45f0a2 am: eea8bb4e80

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1356424

Change-Id: I443256cfa6b656bdce290740bb3bd58b4d817a72
diff --git a/manifest.xml b/manifest.xml
index fee2945..10362de 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -142,22 +142,4 @@
             <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.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>