Merge "Use filegroups for test-{base,mock,runner} srcs"