Bring in updates from CM / Vishal

https://github.com/vishal-android-freak/proprietary_vendor_sony/commits/cm-11.0

Credit/Thanks to respective authors

Change-Id: Ib71df0a72c0a47a1f7231b02379dc999c1f99e99