Revert "Merge branch 'zramdroid' into kitkat"

This reverts commit 07ab7c08f72fe0d780b2ce42244b71d8175dcef8, reversing
changes made to a07ec0bb85d1e8ee13974854fc871823ee34d87d.