Revert "Backport vnswap/frontswap/zswap to Moto G"

This reverts commit 949cb7f6b71361aaf6c716c7ed161936ebf6611d.