Revert "defconfig update"

This reverts commit d7e0314d10c449362f03d903c347e25ff0d44ae8.
Revert "Backport vnswap/frontswap/zswap to Moto G"

This reverts commit dc5bffeee4b1f5a3597a06590bccedcd062db5dc.