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

Change-Id: I683e1722756d09b09c18d506f9e08e269b6e1921