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

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