Merge "Use flash erase & logical block size for userdata wipe" am: c8f7b5bad7 am: a78bbda4e2
am: 445f24f712

Change-Id: I97379a407b4c146f07c2bc44951dd903a0e4e4cc