Merge "Use generated linker config by default" am: 34c0043fd8
am: 2ba6a1eb4e

Change-Id: I4d7b0f1942e84225d3e432745df5491e9b8d7f95