togari: merge Sony 4.4.2 changes

Change-Id: I0bf3ef4d584a1bb966c8ff4780449471ba7a4f86
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_sony_togari into cd-4.4