Merge "Allow passing flash block sizes to libext4_utils" am: de893939ec
am: 8018614aab

Change-Id: I0b6f4c3dddc6d093ab6498ed73557b504b48c775