Fixes to linker code after the conflict resolution

Change-Id: Icd0728604a865b73e7af0e0aee38971a612935f2
3 files changed