Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_sony_msm8226-common into HEAD

Change-Id: I98111a7827eabb9c468db7452fa4cbc27c284cd1
Merge branch 'cm-12.0' of ssh://review.cas-online.nl:29418/android-legacy/android_device_sony_msm8226-common into android-5.0