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

Change-Id: I1ed0a7fae86ca6c4e8bfa499ba145c3631093cf1