Merge "Fix mac build in ResetQuickAllocEntryPoints"