Merge "Update proprietary blobs for deb" into klp-dev
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index d9066f4..97901c0 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -14,7 +14,6 @@
 
 # This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT
 
-/system/app/VZ_SDM.apk
 /system/bin/ATFWD-daemon
 /system/bin/bridgemgrd
 /system/bin/btnvtool
@@ -43,7 +42,6 @@
 /system/bin/usbhub
 /system/bin/usbhub_init
 /system/etc/apns-conf.xml
-/system/etc/DxHDCP.cfg
 /system/etc/firmware/tzapps.b00
 /system/etc/firmware/tzapps.b01
 /system/etc/firmware/tzapps.b02
diff --git a/self-extractors/asus/staging/device-partial.mk b/self-extractors/asus/staging/device-partial.mk
index b3a8cf5..ca7e9be 100644
--- a/self-extractors/asus/staging/device-partial.mk
+++ b/self-extractors/asus/staging/device-partial.mk
@@ -15,6 +15,6 @@
 # Asus blob(s) necessary for Deb hardware
 PRODUCT_COPY_FILES := \
     vendor/asus/deb/proprietary/apns-conf.xml:system/etc/apns-conf.xml:asus \
-    vendor/asus/deb/proprietary/libAKM.so:system/lib/libAKM.so:asus \
     vendor/asus/deb/proprietary/libacdbdata.so:system/lib/libacdbdata.so:asus \
+    vendor/asus/deb/proprietary/libAKM.so:system/lib/libAKM.so:asus \
 
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 7558e02..aa691ed 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -1,8 +1,8 @@
   asus)
     TO_EXTRACT="\
             system/etc/apns-conf.xml \
-            system/lib/libAKM.so \
             system/lib/libacdbdata.so \
+            system/lib/libAKM.so \
             "
     ;;
   broadcom)
@@ -23,7 +23,6 @@
             system/bin/hci_qcomm_init \
             system/bin/irsc_util \
             system/bin/ks \
-            system/bin/mm-pp-daemon \
             system/bin/mm-qcamera-app \
             system/bin/mm-qcamera-daemon \
             system/bin/mm-qjpeg-enc-test \
@@ -41,34 +40,35 @@
             system/bin/thermald \
             system/bin/usbhub \
             system/bin/usbhub_init \
-            system/etc/DxHDCP.cfg \
+            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidc.b00 \
             system/etc/firmware/vidc.b01 \
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
-            system/etc/firmware/vidc.mdt \
-            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidcfw.elf \
+            system/etc/firmware/vidc.mdt \
+            system/etc/gps.conf \
             system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno200.so \
-            system/lib/egl/libGLESv1_CM_adreno200.so \
-            system/lib/egl/libGLESv2_adreno200.so \
-            system/lib/egl/libq3dtools_adreno200.so \
-            system/lib/hw/camera.deb.so \
+            system/lib/egl/libEGL_adreno.so \
+            system/lib/egl/libGLESv1_CM_adreno.so \
+            system/lib/egl/libGLESv2_adreno.so \
+            system/lib/egl/libplayback_adreno.so \
+            system/lib/egl/libq3dtools_adreno.so \
+            system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
-            system/lib/libC2D2.so \
-            system/lib/libCommandSvc.so \
-            system/lib/libDxHdcp.so \
-            system/lib/libI420colorconvert.so \
-            system/lib/libQSEEComAPI.so \
             system/lib/libacdbloader.so \
+            system/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libc2d2_a3xx.so \
+            system/lib/libC2D2.so \
+            system/lib/libc2d30-a3xx.so \
+            system/lib/libc2d30.so \
+            system/lib/libCB.so \
             system/lib/libchromatix_ov5693_common.so \
             system/lib/libchromatix_ov5693_default_video.so \
             system/lib/libchromatix_ov5693_preview.so \
+            system/lib/libCommandSvc.so \
             system/lib/libconfigdb.so \
             system/lib/libcsd-client.so \
             system/lib/libdiag.so \
@@ -80,29 +80,25 @@
             system/lib/libdss.so \
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
-            system/lib/libgeofence.so \
+            system/lib/libDxHdcp.so \
             system/lib/libgps.utils.so \
             system/lib/libgsl.so \
+            system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
             system/lib/libllvm-a3xx.so \
-            system/lib/libloc_adapter.so \
-            system/lib/libloc_api_v02.so \
+            system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
-            system/lib/libmm-abl-oem.so \
             system/lib/libmm-abl.so \
-            system/lib/libmm-color-convertor.so \
             system/lib/libmmcamera2_stats_algorithm.so \
             system/lib/libmmcamera_image_stab.so \
-            system/lib/libmmcamera_interface.so \
             system/lib/libmmcamera_mi1040.so \
             system/lib/libmmcamera_ov5693.so \
-            system/lib/libmmjpeg_interface.so \
+            system/lib/libmm-color-convertor.so \
             system/lib/libnetmgr.so \
             system/lib/liboemcrypto.so \
             system/lib/libqcci_legacy.so \
             system/lib/libqdi.so \
             system/lib/libqdp.so \
-            system/lib/libqmi.so \
             system/lib/libqmi_cci.so \
             system/lib/libqmi_client_qmux.so \
             system/lib/libqmi_common_so.so \
@@ -110,9 +106,13 @@
             system/lib/libqmi_csvt_srvc.so \
             system/lib/libqmi_encdec.so \
             system/lib/libqmiservices.so \
-            system/lib/libqomx_core.so \
+            system/lib/libqmi.so \
+            system/lib/libQSEEComAPI.so \
             system/lib/libril-qc-qmi-1.so \
             system/lib/libril-qcril-hook-oem.so \
+            system/lib/librs_adreno_sha1.so \
+            system/lib/librs_adreno.so \
+            system/lib/libRSDriver_adreno.so \
             system/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
@@ -146,6 +146,11 @@
             system/vendor/firmware/gss.b10 \
             system/vendor/firmware/gss.b11 \
             system/vendor/firmware/gss.mdt \
+            system/vendor/firmware/keymaster/keymaster.b00 \
+            system/vendor/firmware/keymaster/keymaster.b01 \
+            system/vendor/firmware/keymaster/keymaster.b02 \
+            system/vendor/firmware/keymaster/keymaster.b03 \
+            system/vendor/firmware/keymaster/keymaster.mdt \
             system/vendor/firmware/q6.b00 \
             system/vendor/firmware/q6.b01 \
             system/vendor/firmware/q6.b03 \
@@ -166,8 +171,12 @@
             system/vendor/firmware/wcnss.mdt \
             system/vendor/lib/libdrmdecrypt.so \
             system/vendor/lib/libgemini.so \
+            system/vendor/lib/libgeofence.so \
             system/vendor/lib/libimage-jpeg-enc-omx-comp.so \
             system/vendor/lib/libimage-omx-common.so \
+            system/vendor/lib/libizat_core.so \
+            system/vendor/lib/libloc_api_v02.so \
+            system/vendor/lib/libloc_ds_api.so \
             system/vendor/lib/libmmcamera2_c2d_module.so \
             system/vendor/lib/libmmcamera2_cpp_module.so \
             system/vendor/lib/libmmcamera2_iface_modules.so \
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index a3e581f..b914467 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -33,11 +33,11 @@
 # 748593 = JSS15J
 # 750418 = JSS15K
 # end jb-mr2-dev
-BRANCH=jb-mr2-dev
-if test $BRANCH = jb-mr2-dev
+BRANCH=klp-dev
+if test $BRANCH = klp-dev
 then
-  ZIP=razorg-ota-750418
-  BUILD=jss15k
+  ZIP=razorg-ota-870639
+  BUILD=870639
 fi # jb-mr2-dev
 ROOTDEVICE=deb
 DEVICE=deb
@@ -54,8 +54,8 @@
   asus)
     TO_EXTRACT="\
             system/etc/apns-conf.xml \
-            system/lib/libAKM.so \
             system/lib/libacdbdata.so \
+            system/lib/libAKM.so \
             "
     ;;
   broadcom)
@@ -76,7 +76,6 @@
             system/bin/hci_qcomm_init \
             system/bin/irsc_util \
             system/bin/ks \
-            system/bin/mm-pp-daemon \
             system/bin/mm-qcamera-app \
             system/bin/mm-qcamera-daemon \
             system/bin/mm-qjpeg-enc-test \
@@ -94,34 +93,35 @@
             system/bin/thermald \
             system/bin/usbhub \
             system/bin/usbhub_init \
-            system/etc/DxHDCP.cfg \
+            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidc.b00 \
             system/etc/firmware/vidc.b01 \
             system/etc/firmware/vidc.b02 \
             system/etc/firmware/vidc.b03 \
-            system/etc/firmware/vidc.mdt \
-            system/etc/firmware/vidc_1080p.fw \
             system/etc/firmware/vidcfw.elf \
+            system/etc/firmware/vidc.mdt \
+            system/etc/gps.conf \
             system/lib/egl/eglsubAndroid.so \
-            system/lib/egl/libEGL_adreno200.so \
-            system/lib/egl/libGLESv1_CM_adreno200.so \
-            system/lib/egl/libGLESv2_adreno200.so \
-            system/lib/egl/libq3dtools_adreno200.so \
-            system/lib/hw/camera.deb.so \
+            system/lib/egl/libEGL_adreno.so \
+            system/lib/egl/libGLESv1_CM_adreno.so \
+            system/lib/egl/libGLESv2_adreno.so \
+            system/lib/egl/libplayback_adreno.so \
+            system/lib/egl/libq3dtools_adreno.so \
+            system/lib/hw/flp.msm8960.so \
             system/lib/hw/gps.msm8960.so \
             system/lib/hw/sensors.msm8960.so \
-            system/lib/libC2D2.so \
-            system/lib/libCommandSvc.so \
-            system/lib/libDxHdcp.so \
-            system/lib/libI420colorconvert.so \
-            system/lib/libQSEEComAPI.so \
             system/lib/libacdbloader.so \
+            system/lib/libadreno_utils.so \
             system/lib/libaudcal.so \
             system/lib/libaudioalsa.so \
-            system/lib/libc2d2_a3xx.so \
+            system/lib/libC2D2.so \
+            system/lib/libc2d30-a3xx.so \
+            system/lib/libc2d30.so \
+            system/lib/libCB.so \
             system/lib/libchromatix_ov5693_common.so \
             system/lib/libchromatix_ov5693_default_video.so \
             system/lib/libchromatix_ov5693_preview.so \
+            system/lib/libCommandSvc.so \
             system/lib/libconfigdb.so \
             system/lib/libcsd-client.so \
             system/lib/libdiag.so \
@@ -133,29 +133,25 @@
             system/lib/libdss.so \
             system/lib/libdsucsd.so \
             system/lib/libdsutils.so \
-            system/lib/libgeofence.so \
+            system/lib/libDxHdcp.so \
             system/lib/libgps.utils.so \
             system/lib/libgsl.so \
+            system/lib/libI420colorconvert.so \
             system/lib/libidl.so \
             system/lib/libllvm-a3xx.so \
-            system/lib/libloc_adapter.so \
-            system/lib/libloc_api_v02.so \
+            system/lib/libloc_core.so \
             system/lib/libloc_eng.so \
-            system/lib/libmm-abl-oem.so \
             system/lib/libmm-abl.so \
-            system/lib/libmm-color-convertor.so \
             system/lib/libmmcamera2_stats_algorithm.so \
             system/lib/libmmcamera_image_stab.so \
-            system/lib/libmmcamera_interface.so \
             system/lib/libmmcamera_mi1040.so \
             system/lib/libmmcamera_ov5693.so \
-            system/lib/libmmjpeg_interface.so \
+            system/lib/libmm-color-convertor.so \
             system/lib/libnetmgr.so \
             system/lib/liboemcrypto.so \
             system/lib/libqcci_legacy.so \
             system/lib/libqdi.so \
             system/lib/libqdp.so \
-            system/lib/libqmi.so \
             system/lib/libqmi_cci.so \
             system/lib/libqmi_client_qmux.so \
             system/lib/libqmi_common_so.so \
@@ -163,9 +159,13 @@
             system/lib/libqmi_csvt_srvc.so \
             system/lib/libqmi_encdec.so \
             system/lib/libqmiservices.so \
-            system/lib/libqomx_core.so \
+            system/lib/libqmi.so \
+            system/lib/libQSEEComAPI.so \
             system/lib/libril-qc-qmi-1.so \
             system/lib/libril-qcril-hook-oem.so \
+            system/lib/librs_adreno_sha1.so \
+            system/lib/librs_adreno.so \
+            system/lib/libRSDriver_adreno.so \
             system/lib/libsc-a3xx.so \
             system/lib/libsensor1.so \
             system/lib/libsensor_reg.so \
@@ -199,6 +199,11 @@
             system/vendor/firmware/gss.b10 \
             system/vendor/firmware/gss.b11 \
             system/vendor/firmware/gss.mdt \
+            system/vendor/firmware/keymaster/keymaster.b00 \
+            system/vendor/firmware/keymaster/keymaster.b01 \
+            system/vendor/firmware/keymaster/keymaster.b02 \
+            system/vendor/firmware/keymaster/keymaster.b03 \
+            system/vendor/firmware/keymaster/keymaster.mdt \
             system/vendor/firmware/q6.b00 \
             system/vendor/firmware/q6.b01 \
             system/vendor/firmware/q6.b03 \
@@ -219,8 +224,12 @@
             system/vendor/firmware/wcnss.mdt \
             system/vendor/lib/libdrmdecrypt.so \
             system/vendor/lib/libgemini.so \
+            system/vendor/lib/libgeofence.so \
             system/vendor/lib/libimage-jpeg-enc-omx-comp.so \
             system/vendor/lib/libimage-omx-common.so \
+            system/vendor/lib/libizat_core.so \
+            system/vendor/lib/libloc_api_v02.so \
+            system/vendor/lib/libloc_ds_api.so \
             system/vendor/lib/libmmcamera2_c2d_module.so \
             system/vendor/lib/libmmcamera2_cpp_module.so \
             system/vendor/lib/libmmcamera2_iface_modules.so \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 49770fc..9ed1ef8 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -24,7 +24,6 @@
     vendor/qcom/deb/proprietary/hci_qcomm_init:system/bin/hci_qcomm_init:qcom \
     vendor/qcom/deb/proprietary/irsc_util:system/bin/irsc_util:qcom \
     vendor/qcom/deb/proprietary/ks:system/bin/ks:qcom \
-    vendor/qcom/deb/proprietary/mm-pp-daemon:system/bin/mm-pp-daemon:qcom \
     vendor/qcom/deb/proprietary/mm-qcamera-app:system/bin/mm-qcamera-app:qcom \
     vendor/qcom/deb/proprietary/mm-qcamera-daemon:system/bin/mm-qcamera-daemon:qcom \
     vendor/qcom/deb/proprietary/mm-qjpeg-enc-test:system/bin/mm-qjpeg-enc-test:qcom \
@@ -42,33 +41,34 @@
     vendor/qcom/deb/proprietary/thermald:system/bin/thermald:qcom \
     vendor/qcom/deb/proprietary/usbhub:system/bin/usbhub:qcom \
     vendor/qcom/deb/proprietary/usbhub_init:system/bin/usbhub_init:qcom \
-    vendor/qcom/deb/proprietary/DxHDCP.cfg:system/etc/DxHDCP.cfg:qcom \
+    vendor/qcom/deb/proprietary/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw:qcom \
     vendor/qcom/deb/proprietary/vidc.b00:system/etc/firmware/vidc.b00:qcom \
     vendor/qcom/deb/proprietary/vidc.b01:system/etc/firmware/vidc.b01:qcom \
     vendor/qcom/deb/proprietary/vidc.b02:system/etc/firmware/vidc.b02:qcom \
     vendor/qcom/deb/proprietary/vidc.b03:system/etc/firmware/vidc.b03:qcom \
-    vendor/qcom/deb/proprietary/vidc.mdt:system/etc/firmware/vidc.mdt:qcom \
-    vendor/qcom/deb/proprietary/vidc_1080p.fw:system/etc/firmware/vidc_1080p.fw:qcom \
     vendor/qcom/deb/proprietary/vidcfw.elf:system/etc/firmware/vidcfw.elf:qcom \
+    vendor/qcom/deb/proprietary/vidc.mdt:system/etc/firmware/vidc.mdt:qcom \
+    vendor/qcom/deb/proprietary/gps.conf:system/etc/gps.conf:qcom \
     vendor/qcom/deb/proprietary/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so:qcom \
-    vendor/qcom/deb/proprietary/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so:qcom \
-    vendor/qcom/deb/proprietary/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so:qcom \
-    vendor/qcom/deb/proprietary/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so:qcom \
-    vendor/qcom/deb/proprietary/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so:qcom \
-    vendor/qcom/deb/proprietary/camera.deb.so:system/lib/hw/camera.deb.so:qcom \
+    vendor/qcom/deb/proprietary/libEGL_adreno.so:system/lib/egl/libEGL_adreno.so:qcom \
+    vendor/qcom/deb/proprietary/libGLESv1_CM_adreno.so:system/lib/egl/libGLESv1_CM_adreno.so:qcom \
+    vendor/qcom/deb/proprietary/libGLESv2_adreno.so:system/lib/egl/libGLESv2_adreno.so:qcom \
+    vendor/qcom/deb/proprietary/libplayback_adreno.so:system/lib/egl/libplayback_adreno.so:qcom \
+    vendor/qcom/deb/proprietary/libq3dtools_adreno.so:system/lib/egl/libq3dtools_adreno.so:qcom \
+    vendor/qcom/deb/proprietary/flp.msm8960.so:system/lib/hw/flp.msm8960.so:qcom \
     vendor/qcom/deb/proprietary/gps.msm8960.so:system/lib/hw/gps.msm8960.so:qcom \
     vendor/qcom/deb/proprietary/sensors.msm8960.so:system/lib/hw/sensors.msm8960.so:qcom \
-    vendor/qcom/deb/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
-    vendor/qcom/deb/proprietary/libCommandSvc.so:system/lib/libCommandSvc.so:qcom \
-    vendor/qcom/deb/proprietary/libDxHdcp.so:system/lib/libDxHdcp.so:qcom \
-    vendor/qcom/deb/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
-    vendor/qcom/deb/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
+    vendor/qcom/deb/proprietary/libadreno_utils.so:system/lib/libadreno_utils.so:qcom \
     vendor/qcom/deb/proprietary/libaudcal.so:system/lib/libaudcal.so:qcom \
     vendor/qcom/deb/proprietary/libaudioalsa.so:system/lib/libaudioalsa.so:qcom \
-    vendor/qcom/deb/proprietary/libc2d2_a3xx.so:system/lib/libc2d2_a3xx.so:qcom \
+    vendor/qcom/deb/proprietary/libC2D2.so:system/lib/libC2D2.so:qcom \
+    vendor/qcom/deb/proprietary/libc2d30-a3xx.so:system/lib/libc2d30-a3xx.so:qcom \
+    vendor/qcom/deb/proprietary/libc2d30.so:system/lib/libc2d30.so:qcom \
+    vendor/qcom/deb/proprietary/libCB.so:system/lib/libCB.so:qcom \
     vendor/qcom/deb/proprietary/libchromatix_ov5693_common.so:system/lib/libchromatix_ov5693_common.so:qcom \
     vendor/qcom/deb/proprietary/libchromatix_ov5693_default_video.so:system/lib/libchromatix_ov5693_default_video.so:qcom \
     vendor/qcom/deb/proprietary/libchromatix_ov5693_preview.so:system/lib/libchromatix_ov5693_preview.so:qcom \
+    vendor/qcom/deb/proprietary/libCommandSvc.so:system/lib/libCommandSvc.so:qcom \
     vendor/qcom/deb/proprietary/libconfigdb.so:system/lib/libconfigdb.so:qcom \
     vendor/qcom/deb/proprietary/libcsd-client.so:system/lib/libcsd-client.so:qcom \
     vendor/qcom/deb/proprietary/libdiag.so:system/lib/libdiag.so:qcom \
@@ -80,29 +80,25 @@
     vendor/qcom/deb/proprietary/libdss.so:system/lib/libdss.so:qcom \
     vendor/qcom/deb/proprietary/libdsucsd.so:system/lib/libdsucsd.so:qcom \
     vendor/qcom/deb/proprietary/libdsutils.so:system/lib/libdsutils.so:qcom \
-    vendor/qcom/deb/proprietary/libgeofence.so:system/lib/libgeofence.so:qcom \
+    vendor/qcom/deb/proprietary/libDxHdcp.so:system/lib/libDxHdcp.so:qcom \
     vendor/qcom/deb/proprietary/libgps.utils.so:system/lib/libgps.utils.so:qcom \
     vendor/qcom/deb/proprietary/libgsl.so:system/lib/libgsl.so:qcom \
+    vendor/qcom/deb/proprietary/libI420colorconvert.so:system/lib/libI420colorconvert.so:qcom \
     vendor/qcom/deb/proprietary/libidl.so:system/lib/libidl.so:qcom \
     vendor/qcom/deb/proprietary/libllvm-a3xx.so:system/lib/libllvm-a3xx.so:qcom \
-    vendor/qcom/deb/proprietary/libloc_adapter.so:system/lib/libloc_adapter.so:qcom \
-    vendor/qcom/deb/proprietary/libloc_api_v02.so:system/lib/libloc_api_v02.so:qcom \
+    vendor/qcom/deb/proprietary/libloc_core.so:system/lib/libloc_core.so:qcom \
     vendor/qcom/deb/proprietary/libloc_eng.so:system/lib/libloc_eng.so:qcom \
-    vendor/qcom/deb/proprietary/libmm-abl-oem.so:system/lib/libmm-abl-oem.so:qcom \
     vendor/qcom/deb/proprietary/libmm-abl.so:system/lib/libmm-abl.so:qcom \
-    vendor/qcom/deb/proprietary/libmm-color-convertor.so:system/lib/libmm-color-convertor.so:qcom \
     vendor/qcom/deb/proprietary/libmmcamera2_stats_algorithm.so:system/lib/libmmcamera2_stats_algorithm.so:qcom \
     vendor/qcom/deb/proprietary/libmmcamera_image_stab.so:system/lib/libmmcamera_image_stab.so:qcom \
-    vendor/qcom/deb/proprietary/libmmcamera_interface.so:system/lib/libmmcamera_interface.so:qcom \
     vendor/qcom/deb/proprietary/libmmcamera_mi1040.so:system/lib/libmmcamera_mi1040.so:qcom \
     vendor/qcom/deb/proprietary/libmmcamera_ov5693.so:system/lib/libmmcamera_ov5693.so:qcom \
-    vendor/qcom/deb/proprietary/libmmjpeg_interface.so:system/lib/libmmjpeg_interface.so:qcom \
+    vendor/qcom/deb/proprietary/libmm-color-convertor.so:system/lib/libmm-color-convertor.so:qcom \
     vendor/qcom/deb/proprietary/libnetmgr.so:system/lib/libnetmgr.so:qcom \
     vendor/qcom/deb/proprietary/liboemcrypto.so:system/lib/liboemcrypto.so:qcom \
     vendor/qcom/deb/proprietary/libqcci_legacy.so:system/lib/libqcci_legacy.so:qcom \
     vendor/qcom/deb/proprietary/libqdi.so:system/lib/libqdi.so:qcom \
     vendor/qcom/deb/proprietary/libqdp.so:system/lib/libqdp.so:qcom \
-    vendor/qcom/deb/proprietary/libqmi.so:system/lib/libqmi.so:qcom \
     vendor/qcom/deb/proprietary/libqmi_cci.so:system/lib/libqmi_cci.so:qcom \
     vendor/qcom/deb/proprietary/libqmi_client_qmux.so:system/lib/libqmi_client_qmux.so:qcom \
     vendor/qcom/deb/proprietary/libqmi_common_so.so:system/lib/libqmi_common_so.so:qcom \
@@ -110,9 +106,13 @@
     vendor/qcom/deb/proprietary/libqmi_csvt_srvc.so:system/lib/libqmi_csvt_srvc.so:qcom \
     vendor/qcom/deb/proprietary/libqmi_encdec.so:system/lib/libqmi_encdec.so:qcom \
     vendor/qcom/deb/proprietary/libqmiservices.so:system/lib/libqmiservices.so:qcom \
-    vendor/qcom/deb/proprietary/libqomx_core.so:system/lib/libqomx_core.so:qcom \
+    vendor/qcom/deb/proprietary/libqmi.so:system/lib/libqmi.so:qcom \
+    vendor/qcom/deb/proprietary/libQSEEComAPI.so:system/lib/libQSEEComAPI.so:qcom \
     vendor/qcom/deb/proprietary/libril-qc-qmi-1.so:system/lib/libril-qc-qmi-1.so:qcom \
     vendor/qcom/deb/proprietary/libril-qcril-hook-oem.so:system/lib/libril-qcril-hook-oem.so:qcom \
+    vendor/qcom/deb/proprietary/librs_adreno_sha1.so:system/lib/librs_adreno_sha1.so:qcom \
+    vendor/qcom/deb/proprietary/librs_adreno.so:system/lib/librs_adreno.so:qcom \
+    vendor/qcom/deb/proprietary/libRSDriver_adreno.so:system/lib/libRSDriver_adreno.so:qcom \
     vendor/qcom/deb/proprietary/libsc-a3xx.so:system/lib/libsc-a3xx.so:qcom \
     vendor/qcom/deb/proprietary/libsensor1.so:system/lib/libsensor1.so:qcom \
     vendor/qcom/deb/proprietary/libsensor_reg.so:system/lib/libsensor_reg.so:qcom \
@@ -146,6 +146,11 @@
     vendor/qcom/deb/proprietary/gss.b10:system/vendor/firmware/gss.b10:qcom \
     vendor/qcom/deb/proprietary/gss.b11:system/vendor/firmware/gss.b11:qcom \
     vendor/qcom/deb/proprietary/gss.mdt:system/vendor/firmware/gss.mdt:qcom \
+    vendor/qcom/deb/proprietary/keymaster.b00:system/vendor/firmware/keymaster/keymaster.b00:qcom \
+    vendor/qcom/deb/proprietary/keymaster.b01:system/vendor/firmware/keymaster/keymaster.b01:qcom \
+    vendor/qcom/deb/proprietary/keymaster.b02:system/vendor/firmware/keymaster/keymaster.b02:qcom \
+    vendor/qcom/deb/proprietary/keymaster.b03:system/vendor/firmware/keymaster/keymaster.b03:qcom \
+    vendor/qcom/deb/proprietary/keymaster.mdt:system/vendor/firmware/keymaster/keymaster.mdt:qcom \
     vendor/qcom/deb/proprietary/q6.b00:system/vendor/firmware/q6.b00:qcom \
     vendor/qcom/deb/proprietary/q6.b01:system/vendor/firmware/q6.b01:qcom \
     vendor/qcom/deb/proprietary/q6.b03:system/vendor/firmware/q6.b03:qcom \
@@ -165,8 +170,12 @@
     vendor/qcom/deb/proprietary/wcnss.mdt:system/vendor/firmware/wcnss.mdt:qcom \
     vendor/qcom/deb/proprietary/libdrmdecrypt.so:system/vendor/lib/libdrmdecrypt.so:qcom \
     vendor/qcom/deb/proprietary/libgemini.so:system/vendor/lib/libgemini.so:qcom \
+    vendor/qcom/deb/proprietary/libgeofence.so:system/vendor/lib/libgeofence.so:qcom \
     vendor/qcom/deb/proprietary/libimage-jpeg-enc-omx-comp.so:system/vendor/lib/libimage-jpeg-enc-omx-comp.so:qcom \
     vendor/qcom/deb/proprietary/libimage-omx-common.so:system/vendor/lib/libimage-omx-common.so:qcom \
+    vendor/qcom/deb/proprietary/libizat_core.so:system/vendor/lib/libizat_core.so:qcom \
+    vendor/qcom/deb/proprietary/libloc_api_v02.so:system/vendor/lib/libloc_api_v02.so:qcom \
+    vendor/qcom/deb/proprietary/libloc_ds_api.so:system/vendor/lib/libloc_ds_api.so:qcom \
     vendor/qcom/deb/proprietary/libmmcamera2_c2d_module.so:system/vendor/lib/libmmcamera2_c2d_module.so:qcom \
     vendor/qcom/deb/proprietary/libmmcamera2_cpp_module.so:system/vendor/lib/libmmcamera2_cpp_module.so:qcom \
     vendor/qcom/deb/proprietary/libmmcamera2_iface_modules.so:system/vendor/lib/libmmcamera2_iface_modules.so:qcom \
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index a1a5d7d..c4eed0a 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -2,6 +2,7 @@
 root/adb_keys:google
 system/bin/ATFWD-daemon:qcom
 system/app/AsusDebugger.apk:asus
+system/app/VZ_SDM.apk:asus
 system/etc/DxHDCP.cfg:qcom
 system/vendor/firmware/bcm2079x-b5_firmware.ncd:broadcom
 system/vendor/firmware/bcm2079x-b5_pre_firmware.ncd:broadcom
@@ -36,18 +37,34 @@
 system/vendor/firmware/gss.b10:qcom
 system/vendor/firmware/gss.b11:qcom
 system/vendor/firmware/gss.mdt:qcom
+system/vendor/firmware/keymaster/keymaster.b00:qcom
+system/vendor/firmware/keymaster/keymaster.b01:qcom
+system/vendor/firmware/keymaster/keymaster.b02:qcom
+system/vendor/firmware/keymaster/keymaster.b03:qcom
+system/vendor/firmware/keymaster/keymaster.mdt:qcom
 system/bin/hci_qcomm_init:qcom
 system/bin/irsc_util:qcom
 system/bin/ks:qcom
+system/etc/gps.conf:qcom
+system/lib/egl/libEGL_adreno.so:qcom
+system/lib/egl/libGLESv1_CM_adreno.so:qcom
+system/lib/egl/libGLESv2_adreno.so:qcom
+system/lib/egl/libplayback_adreno.so:qcom
+system/lib/egl/libq3dtools_adreno.so:qcom
 system/lib/libAKM.so:asus
+system/lib/libCB.so:qcom
 system/lib/libCommandSvc.so:qcom
 system/lib/libDxHdcp.so:qcom
 system/lib/libI420colorconvert.so:qcom
 system/lib/libQSEEComAPI.so:qcom
+system/lib/libRSDriver_adreno.so:qcom
 system/lib/libacdbdata.so:asus
 system/lib/libacdbloader.so:qcom
+system/lib/libadreno_utils.so:qcom
 system/lib/libaudcal.so:qcom
 system/lib/libaudioalsa.so:qcom
+system/lib/libc2d30-a3xx.so:qcom
+system/lib/libc2d30.so:qcom
 system/lib/libchromatix_ov5693_common.so:qcom
 system/lib/libchromatix_ov5693_default_video.so:qcom
 system/lib/libchromatix_ov5693_preview.so:qcom
@@ -64,9 +81,14 @@
 system/lib/libdsucsd.so:qcom
 system/lib/libdsutils.so:qcom
 system/vendor/lib/libgemini.so:qcom
+system/vendor/lib/libgeofence.so:qcom
 system/vendor/lib/libimage-jpeg-enc-omx-comp.so:qcom
 system/vendor/lib/libimage-omx-common.so:qcom
+system/vendor/lib/libizat_core.so:qcom
+system/vendor/lib/libloc_api_v02.so:qcom
+system/vendor/lib/libloc_ds_api.so:qcom
 system/lib/libloc_api_v02.so:qcom
+system/lib/libloc_core.so:qcom
 system/lib/libmm-abl.so:qcom
 system/lib/libmm-abl-oem.so:qcom
 system/lib/libmm-color-convertor.so:qcom
@@ -88,6 +110,8 @@
 system/lib/libnetmgr.so:qcom
 system/vendor/lib/liboemcamera.so:qcom
 system/lib/liboemcrypto.so:qcom
+system/lib/librs_adreno_sha1.so:qcom
+system/lib/librs_adreno.so:qcom
 system/lib/libqcci_legacy.so:qcom
 system/lib/libqdi.so:qcom
 system/lib/libqdp.so:qcom
@@ -126,6 +150,7 @@
 system/bin/qseecomd:qcom
 system/bin/radish:qcom
 system/bin/rmt_storage:qcom
+system/lib/hw/flp.msm8960.so:qcom
 system/lib/hw/sensors.msm8960.so:qcom
 system/bin/sensors.qcom:qcom
 system/bin/thermald:qcom