Merge "fastboot: handle small flash block sizes correctly" am: ebcfa44937
am: 5aff24e01d

Change-Id: I55f894d3393abf29504237fea973650ae1a0abc0