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

Change-Id: I09a6eeac99a51512ac60b4c9d43dace75f228bce