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

Change-Id: I8e7b05e53626c0b78b0e741d4369e6b324074ba1