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

Change-Id: I1c14c2fc59bdfe656ad404796df8d397e2486706