Revert "enable new zram options"

This reverts commit 4ae24e40197f5232ab14c1b471f73171154c83c3.

Conflicts:
	arch/arm/configs/candy_ville_defconfig