Merge "Fix mac build in ResetQuickAllocEntryPoints"
am: f9c2f88d13

Change-Id: Ieec9eed95858167e263fd2f045385f951e3d9ff9