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

Change-Id: Icf62bc33c37580201f7838feb4897697982e6812