Revert "Squash zram related commits based  on Faux123's work"

This reverts commit c4f63d476f876b60eb45fcbcb9ffdd689645de1f.

Change-Id: I3084e698647693ce97168fbe48b5de85205173e1