Merge branch 'zram' into cm-11.0

Change-Id: Ie22e0bdc2757927253bb3309c1f067e4a1adc5be