am 5ece4724: Merge "Enable lunch command to pick up new toolchain version."

* commit '5ece4724d19712225d4fbb6d91d86619015d81b3':
  Enable lunch command to pick up new toolchain version.