Merge "Ensure CC GC is used for the read barrier config."
am: 96de579b8c

Change-Id: I36400acaa712fc52b4bdd62370b5a1b09d8aef0d