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

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