Merge "Use generated linker config" am: 6b0d1cd3ac am: 7660ec25aa
am: 8bdd118698

Change-Id: I8f927bb40d221c87c04ea880ba85e3d6a3c83367