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

Change-Id: I240b5d9356435705df574fa5f6c7beda31454f97