Merge "fastboot: handle small flash block sizes correctly"