z3c cm diff

diff --git device/sony/shinano-common/rootdir/init.qcom.rc device/sony/shinano-common/rootdir/init.qcom.rc
index 287ccc1..c4dd38d 100644
--- device/sony/shinano-common/rootdir/init.qcom.rc
+++ device/sony/shinano-common/rootdir/init.qcom.rc
@@ -390,6 +390,10 @@ on charger
     write /sys/devices/system/cpu/cpu2/online 0
     write /sys/devices/system/cpu/cpu3/online 0
 
+# hack for display bug
+on property:vold.decrypt=trigger_restart_framework
+    restart surfaceflinger
+
 on property:init.svc.wpa_supplicant=stopped
     stop dhcpcd
 
diff --git device/sony/shinano-common/shinano.mk device/sony/shinano-common/shinano.mk
index e35a0fe..a64ec3b 100644
--- device/sony/shinano-common/shinano.mk
+++ device/sony/shinano-common/shinano.mk
@@ -126,7 +126,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 # Audio offload
 PRODUCT_PROPERTY_OVERRIDES += \
     audio.offload.buffer.size.kb=32 \
-    audio.offload.gapless.enabled=false \
+    audio.offload.gapless.enabled=true \
     audio.offload.multiple.enabled=false \
     audio.offload.pcm.enable=enable \
     av.offload.enable=enable \
 
diff --git vendor/sony/shinano-common/Android.mk vendor/sony/shinano-common/Android.mk
index e716d95..0d4beb3 100644
--- vendor/sony/shinano-common/Android.mk
+++ vendor/sony/shinano-common/Android.mk
@@ -29,16 +29,5 @@ LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.qualcomm.location
-LOCAL_MODULE_OWNER := sony
-LOCAL_SRC_FILES := proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
 endif
 endif
diff --git frameworks/base/data/etc/platform.xml frameworks/base/data/etc/platform.xml
index 51271bf..88baf78 100644
--- frameworks/base/data/etc/platform.xml
+++ frameworks/base/data/etc/platform.xml
@@ -65,6 +65,7 @@
     <permission name="android.permission.WRITE_EXTERNAL_STORAGE" >
         <group gid="sdcard_r" />
         <group gid="sdcard_rw" />
+        <group gid="media_rw" />
     </permission>
 
     <permission name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE" >
diff --git a/media_codecs.xml b/media_codecs.xml
index 1492923..e874f83 100644
--- device/sony/msm8974-common/media_codecs.xml
+++ device/sony/msm8974-common/media_codecs.xml
@@ -77,11 +77,6 @@
             <Quirk name="requires-allocate-on-output-ports" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
     </Decoders>
     <Include href="media_codecs_google_video.xml" />
     <Include href="media_codecs_ffmpeg.xml" />