Revert "Revert "Merge branch 'cm-10.1' of git://github.com/OpenSEMC/android_device_sony_nozomi into nhnt11""

This reverts commit 90cab64d77c1095be781403026a1b9349ced07d4.