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

Change-Id: I171f391688967c00861c83ed4965eab135bae5d8