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

Change-Id: I839d2bfc446ce327af12f12596ba8836be108ac7