am e50d91f9: am d93d4601: am 45873583: Merge "Add extra environment info to build output"

* commit 'e50d91f9dac20546152b575cdab7781b646ee2ed':
  Add extra environment info to build output