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

Change-Id: I08b24378aa34c5061cb658c364f87f9cc230bb83