(2/2) Make ROM compatible with ext4/f2fs

Change-Id: Ib366fda352cc727dd2c6d13f2571a76030e415d4
Merge "(2/2) Make ROM compatible with ext4/f2fs" into f2fs