am 385311f3: am 7f74a960: Merge "More CTS Test Runner Fixes" into froyo