Merge "Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources."