am d44927b8: Merge "Refactor linker allocator"

* commit 'd44927b8e9f4b2bcd376d1f84bad46f3ba9094de':
  Refactor linker allocator