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

Change-Id: If25df2907d12656e76d0db25637ea31792a227a3