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

Change-Id: I9e40935d1211285f542c172025bf6db342c699c9