Enable ZRAM
Merge branch 'cm-11.0' into zram