Revert "Cm10.1ify"

This reverts commit 6f1db48feb3a9752b5a5d511d3922333fcfa9b39.

Conflicts:
	device_k2_cl.mk
	recovery.fstab