am 115323db: am 0a142c96: Merge "Redirect failing test output to stderr."

* commit '115323db8efc1a7264bebef215edae9356a1b810':
  Redirect failing test output to stderr.