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

This reverts commit 959ff1264f0b4fce6c287b91e0902a03bead30a0.

Conflicts:
	fuji.mk