Move framework-wifi into the Wifi APEX

Bug: 140299412
Test: device boots up and connects to Wifi
Change-Id: I0ae9ed5a21232385394f2e21b81671997ac86d23
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c928af4..278a0a8 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -88,7 +88,6 @@
     framework-minus-apex \
     framework-res \
     framework-sysconfig.xml \
-    framework-wifi \
     fsck_msdos \
     fs_config_files_system \
     fs_config_dirs_system \
@@ -342,7 +341,8 @@
     com.android.media:updatable-media \
     com.android.sdkext:framework-sdkext \
     com.android.telephony:telephony-common \
-    com.android.telephony:ims-common
+    com.android.telephony:ims-common \
+    com.android.wifi:framework-wifi
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \