Merge branch 'cm-11.0' of github.com:freexperia/android_device_sony_nicki into cm-11.0