Merge "Create test-legacy/ for android.test.legacy target"