Merge "Fix macOS build after enabling Generational CC by default in ART (cont.)" am: eaa4f836 am: 8f83f87a am: 6f683269 Change-Id: Ibe8ed3e56d582324ad32c16970180caf55ed2a6b