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

Change-Id: Ia93c8fd9fd4b799ec253241e0571077006ded21b