Merge "CtsVerifier Test List Infrastructure" into froyo