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

Change-Id: Id439a333572fc860222ee150cb7f5ec5ac2d0281