Merge "Fastboot: use flash erase & logical block size for building userdata"
am: 6e0dd6285e

Change-Id: I1b9fa4a0335f4a9f834607b92d7f74b9d7afed94