Merge "Replace make_ext4fs with mke2fs"
am: bd532fbf2e

Change-Id: Iea994024e4483f79d1560e21ddc4db7136f540c5