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

Change-Id: Iec9c0097b1cf95d56537c89176eda402d022b803