Revert "Cm10.1ify"

This reverts commit 6f1db48feb3a9752b5a5d511d3922333fcfa9b39.

Conflicts:
	device_k2_cl.mk
	recovery.fstab
fix bad merge
fix bad merge
set to build kernel
Update device_k2_cl.mk
Update device_k2_cl.mk
Update device_k2_cl.mk
Update device_k2_cl.mk
Fix the boardconfig for magic life
Bad things happen when you forget to comment