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

Change-Id: I1dcea9b6d0ae2fa4a642fe043a3d3e18c6a6b11c