Merge "fs_mgr: Fix ZRAM error when ZRAM disk size beyond (2^31-1) bytes"
am: 28c11dcff4

Change-Id: I8b67777e1136a50b4233dce1450c7df867ccd744