[automerger skipped] Merge changes from topic "linker-config" am: 75cff06f5a am: dd20c55ba0
am: d64f7e7c73  -s ours

Change-Id: Ibd9507f335d37c943abae258d1c5ca3f381b1a98