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

Change-Id: I3ecfb77fd639684d0a448b2eafa22570bf5796da