am 58522099: Merge "Make logging fall back to /dev/stderr if we\'re on the host."

* commit '58522099e52be3b5eba702ee6e82c03050e0dcca':
  Make logging fall back to /dev/stderr if we're on the host.