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

Change-Id: I7f377d43051a8272bab5089b14c35abe7e9958c5