merge in mnc-release history after reset to mnc-dev
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index f3aca2d..23d6df9 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -129,7 +129,6 @@
/system/lib/arm/libstagefright.so
/system/lib/arm/libstagefright_yuv.so
/system/lib/arm/libstdc++.so
-/system/lib/arm/libstlport.so
/system/lib/arm/libsurfaceflinger.so
/system/lib/arm/libsync.so
/system/lib/arm/libsysutils.so
@@ -201,7 +200,7 @@
/system/priv-app/AtvRemoteService/AtvRemoteService.apk
/system/priv-app/LeanbackLauncher/LeanbackLauncher.apk
/system/priv-app/TV/TV.apk
-/system/usr/share/librscruntime.bc
+/system/vendor/lib/librscruntime.bc
/system/vendor/bin/bcc.moorefield
/system/vendor/bin/framebuffer_test
/system/vendor/bin/hwperfbin2jsont
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 58993b9..5b85f45 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -133,7 +133,6 @@
system/lib/arm/libstagefright.so \
system/lib/arm/libstagefright_yuv.so \
system/lib/arm/libstdc++.so \
- system/lib/arm/libstlport.so \
system/lib/arm/libsurfaceflinger.so \
system/lib/arm/libsync.so \
system/lib/arm/libsysutils.so \
@@ -200,7 +199,7 @@
system/lib/libOMXVideoDecoderAVCSecure.so \
system/lib/libsepdrm_cc54.so \
system/lib/libstlport-mfx.so \
- system/usr/share/librscruntime.bc \
+ system/vendor/lib/librscruntime.bc \
system/vendor/bin/bcc.moorefield \
system/vendor/bin/framebuffer_test \
system/vendor/bin/hwperfbin2jsont \
diff --git a/self-extractors/intel/staging/device-partial.mk b/self-extractors/intel/staging/device-partial.mk
index d591866..27d0ccd 100644
--- a/self-extractors/intel/staging/device-partial.mk
+++ b/self-extractors/intel/staging/device-partial.mk
@@ -122,7 +122,6 @@
vendor/intel/fugu/proprietary/libstagefright.so:system/lib/arm/libstagefright.so:intel \
vendor/intel/fugu/proprietary/libstagefright_yuv.so:system/lib/arm/libstagefright_yuv.so:intel \
vendor/intel/fugu/proprietary/libstdc++.so:system/lib/arm/libstdc++.so:intel \
- vendor/intel/fugu/proprietary/libstlport.so:system/lib/arm/libstlport.so:intel \
vendor/intel/fugu/proprietary/libsurfaceflinger.so:system/lib/arm/libsurfaceflinger.so:intel \
vendor/intel/fugu/proprietary/libsync.so:system/lib/arm/libsync.so:intel \
vendor/intel/fugu/proprietary/libsysutils.so:system/lib/arm/libsysutils.so:intel \
@@ -189,7 +188,7 @@
vendor/intel/fugu/proprietary/libOMXVideoDecoderAVCSecure.so:system/lib/libOMXVideoDecoderAVCSecure.so:intel \
vendor/intel/fugu/proprietary/libsepdrm_cc54.so:system/lib/libsepdrm_cc54.so:intel \
vendor/intel/fugu/proprietary/libstlport-mfx.so:system/lib/libstlport-mfx.so:intel \
- vendor/intel/fugu/proprietary/librscruntime.bc:system/usr/share/librscruntime.bc:intel \
+ vendor/intel/fugu/proprietary/librscruntime.bc:system/vendor/lib/librscruntime.bc:intel \
vendor/intel/fugu/proprietary/bcc.moorefield:system/vendor/bin/bcc.moorefield:intel \
vendor/intel/fugu/proprietary/framebuffer_test:system/vendor/bin/framebuffer_test:intel \
vendor/intel/fugu/proprietary/hwperfbin2jsont:system/vendor/bin/hwperfbin2jsont:intel \
diff --git a/vendor_owner_info.txt b/vendor_owner_info.txt
index 45708a4..88771de 100644
--- a/vendor_owner_info.txt
+++ b/vendor_owner_info.txt
@@ -113,7 +113,6 @@
system/lib/arm/libstagefright.so:intel
system/lib/arm/libstagefright_yuv.so:intel
system/lib/arm/libstdc++.so:intel
-system/lib/arm/libstlport.so:intel
system/lib/arm/libsurfaceflinger.so:intel
system/lib/arm/libsync.so:intel
system/lib/arm/libsysutils.so:intel
@@ -185,7 +184,7 @@
system/priv-app/AtvRemoteService/AtvRemoteService.apk:google
system/priv-app/LeanbackLauncher/LeanbackLauncher.apk:google
system/priv-app/TV/TV.apk:google
-system/usr/share/librscruntime.bc:intel
+system/vendor/lib/librscruntime.bc:intel
system/vendor/bin/bcc.moorefield:intel
system/vendor/bin/framebuffer_test:intel
system/vendor/bin/hwperfbin2jsont:intel
