crespo: Clean up overrides and enable zram by default

Change-Id: If59331c707af53a06ee5b8d08cde5f640d69a18c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0