Merge "Make ART build/test configurations use the CC collector by default."