Merge "Declare that testViewport targets Froyo APIs"