Merge "Make ART build/test configurations use the CC collector by default."
am: 741a81af44

Change-Id: Ica953a72f63c07fb551b75b2f0448bb1212d792f