Merge "Make CTS host capture JUnit errors too." into froyo