am 283ec625: am 6897b7b8: Merge "Fix for linker allocator"

* commit '283ec6256bdde5685f224efdc67a061cc611b33a':
  Fix for linker allocator