Merge "zram: add bitfield to FstabEntry" am: 9c833f1e28 am: 267eba1cde
am: e57265b226

Change-Id: I150847e3ca321a0123df5b7777e67586e4c6d610