am dda864ba: am 8c812b71: Merge "Refactor the alloc entry point generation code."

* commit 'dda864bab8643cf1e224fd5ec38e38c1434753e5':
  Refactor the alloc entry point generation code.