Merge "More CTS Test Runner Fixes" into froyo