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

Change-Id: I9a286ffd5ecaea71c549006be5b79e70078b997d