Update self-extractors

Change-Id: I5c8d42154895cc172604d854e96701a9cb5b79f9
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 39bafaa..220916e 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -39,8 +39,6 @@
     TO_EXTRACT="\
             system/bin/btmacreader \
             system/bin/glgps \
-            system/bin/sensors-config \
-            system/bin/setup_fs \
             system/bin/tf_daemon \
             system/etc/asound.conf \
             system/etc/firmware/bcm4330.hcd \
@@ -61,13 +59,11 @@
             system/lib/hw/gralloc.tegra3.so \
             system/lib/hw/hwcomposer.tegra3.so \
             system/lib/hw/sensors.grouper.so \
-            system/lib/libami.so \
-            system/lib/libami_sensor_mw.so \
             system/lib/libardrv_dynamic.so \
             system/lib/libcgdrv.so \
             system/lib/libdrmdecrypt.so \
+            system/lib/libinvensense_hal.so \
             system/lib/libmllite.so \
-            system/lib/libmlplatform.so \
             system/lib/libmplmpu.so \
             system/lib/libnvapputil.so \
             system/lib/libnvasfparserhal.so \
@@ -109,9 +105,7 @@
             system/lib/libnvtvmr.so \
             system/lib/libnvwinsys.so \
             system/lib/libnvwsi.so \
-            system/lib/libsensors.base.so \
             system/lib/libsensors.lightsensor.so \
-            system/lib/libsensors.mpl.so \
             system/lib/libstagefrighthw.so \
             system/lib/libtf_crypto_sst.so \
             system/vendor/firmware/libpn544_fw.so \
diff --git a/self-extractors/unknown/staging/device-partial.mk b/self-extractors/unknown/staging/device-partial.mk
index a65e831..c8e235f 100644
--- a/self-extractors/unknown/staging/device-partial.mk
+++ b/self-extractors/unknown/staging/device-partial.mk
@@ -15,8 +15,6 @@
 # blob(s) necessary for Grouper hardware
 PRODUCT_PACKAGES := \
     asound \
-    baseband_usb_chr \
-    baseband-xmm-power2 \
     bcm4330 \
     btmacreader \
     camera.tegra3 \
@@ -25,8 +23,6 @@
     gpsconfig \
     gralloc.tegra3 \
     hwcomposer.tegra3 \
-    libami \
-    libami_sensor_mw \
     libardrv_dynamic \
     libcgdrv \
     libdrmdecrypt \
@@ -34,8 +30,8 @@
     libEGL_tegra \
     libGLESv1_CM_tegra \
     libGLESv2_tegra \
+    libinvensense_hal \
     libmllite \
-    libmlplatform \
     libmplmpu \
     libnvapputil \
     libnvasfparserhal \
@@ -77,17 +73,13 @@
     libnvtvmr \
     libnvwinsys \
     libnvwsi \
-    libpkip \
     libpn544_fw \
-    libsensors.base \
     libsensors.lightsensor \
-    libsensors.mpl \
     libstagefrighthw \
     libtf_crypto_sst \
     libwvdrm_L1 \
     libwvm \
     libWVStreamControlAPI_L1 \
-    nfc.tegra3 \
     nvavp_os_00001000 \
     nvavp_os_0ff00000 \
     nvavp_os_e0000000 \
@@ -95,11 +87,7 @@
     nvavp_vid_ucode_alt \
     nvcamera \
     nvram \
-    raw_ip_net \
-    scsi_wait_scan \
     sensors.grouper \
-    setup_fs \
-    tcrypt \
     tf_daemon \
     touch_fw
 
diff --git a/self-extractors/unknown/staging/proprietary/Android.mk b/self-extractors/unknown/staging/proprietary/Android.mk
index b911db0..8f24e27 100644
--- a/self-extractors/unknown/staging/proprietary/Android.mk
+++ b/self-extractors/unknown/staging/proprietary/Android.mk
@@ -96,24 +96,6 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libami
-LOCAL_SRC_FILES := libami.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libami_sensor_mw
-LOCAL_SRC_FILES := libami_sensor_mw.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := libardrv_dynamic
 LOCAL_SRC_FILES := libardrv_dynamic.so
 LOCAL_MODULE_SUFFIX := .so
@@ -177,8 +159,8 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmllite
-LOCAL_SRC_FILES := libmllite.so
+LOCAL_MODULE := libinvensense_hal
+LOCAL_SRC_FILES := libinvensense_hal.so
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
@@ -186,8 +168,8 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libmlplatform
-LOCAL_SRC_FILES := libmlplatform.so
+LOCAL_MODULE := libmllite
+LOCAL_SRC_FILES := libmllite.so
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
@@ -573,15 +555,6 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libsensors.base
-LOCAL_SRC_FILES := libsensors.base.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := libsensors.lightsensor
 LOCAL_SRC_FILES := libsensors.lightsensor.so
 LOCAL_MODULE_SUFFIX := .so
@@ -591,15 +564,6 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libsensors.mpl
-LOCAL_SRC_FILES := libsensors.mpl.so
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := libstagefrighthw
 LOCAL_SRC_FILES := libstagefrighthw.so
 LOCAL_MODULE_SUFFIX := .so
@@ -708,14 +672,6 @@
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := sensors-config
-LOCAL_SRC_FILES := sensors-config
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := sensors.grouper
 LOCAL_SRC_FILES := sensors.grouper.so
 LOCAL_MODULE_SUFFIX := .so