Merge "Use legacy-test instead of core-junit"