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

Change-Id: I7d788a6ccc2b4b0ec1c68f605ae1ffc60a80db34