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

Change-Id: If46a4865218a42be67c1f46d04780e29a843f872