am 6b251e81: am 63ae3484: am 19431616: am 3b5b1060: Merge "Make CTS host capture JUnit errors too." into froyo

Merge commit '6b251e810999b5a7b4fc7b233d67d2e461eeccc4'

* commit '6b251e810999b5a7b4fc7b233d67d2e461eeccc4':
  Make CTS host capture JUnit errors too.