Merge "fastboot: preserve partition_type if wants_wipe=true" am: 390b48bad2 am: 7e810bd65f am: 3dbd99caf5 am: 3f8d39c335
am: 3333e6aad6

Change-Id: I3f4e8eb1f45ddec1733c7be0a216926dd856857f