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

Change-Id: If57135eb48c0f9376eb6a4c658d60b99573930e3