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

Change-Id: I49ace0b57dbe71c3b11945e76a9af1ff9b805c2c