Merge "Fix macOS build after enabling Generational CC by default in ART (cont.)"
am: eaa4f83670

Change-Id: If43c54fee14675c7f951f9fbf0d518e65df180ae