Merge "Fix race in AllocEntrypointsInstrumented" am: 6f1b7ec
am: 55d89b8

* commit '55d89b8ab9c8e71ae61c88f84cbba4949a6ff64a':
  Fix race in AllocEntrypointsInstrumented