Merge "Pass flash erase & logical block size to mke2fs"
am: cf4f7eac85

Change-Id: I135f5117e4c0ac02ee22e0d2e6262894cb18b629