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

Change-Id: I5338320ddac7dde9da45c218620a98827052c333