Merge "Modernize fastboot output format." am: 194e27bf5e
am: a6905f79b7

Change-Id: I33c1177e140d557529abdb93edcd2c8dfb87907c