Conform defconfig to CM's unified variant setup and remove
unused defconfigs

Change-Id: Ic73d05fbebc72913f9c13fe9fc1b77a7f9df7681

Conflicts:
	arch/arm/configs/cyanogen_jf_defconfig