am 294d3f74: Merge "Remove a prehistoric fastboot hack."

* commit '294d3f745274330fc86476332f9431285400be2b':
  Remove a prehistoric fastboot hack.