Merge "Use generated linker config only" am: 3c0e06d829 am: eafc79a135 am: 799f3fe12a

Change-Id: I41041584f9fff5d5217d79fb252687b4941b154f