Merge git://github.com/CyanogenMod/android_device_sony_nicki into cm-11.0
Merge branch 'nolinuxnoparty' into HEAD