Merge "Fix macOS build after enabling Generational CC by default in ART." am: 06fc2a94 am: 9c36f303 am: 7386b4d5 Change-Id: I0166b968c7558d9b1a2b61ae2de3f10278b41c4f