amami: merge Sony 4.4.2 change

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