Merge "Clean up the partition name mapping in fastboot."
am: bdbcdf3a16

Change-Id: I424b6bd4141df78471fc2b51a02df96ece70059e