Merge "Fix race in AllocEntrypointsInstrumented"