Merge changes from topic "linker-config"
am: 75cff06f5a

Change-Id: Ie0ec2e64abff6952f79e39d57c6e0523084a6cdf