Merge "Remove test runner tool vogar from Froyo." into froyo