Merge "Replace generic GC type flag with a specific Generational CC flag." am: 77ad6aee15
am: 2c2a2774d5

Change-Id: I7e05823618b1d1ceefa5553c4b7cc20674ae123d