Merge "fastboot: call mke2fs tools to generate ext4 image am: ffef31cef1  -s ours am: abc99e2ccf" into oc-mr1-dev-plus-aosp