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

Merge commit '194316166685d1a09d0cf85233a436bab9727b9a' into gingerbread

* commit '194316166685d1a09d0cf85233a436bab9727b9a':
  Make CTS host capture JUnit errors too.