Merge "Generate linker config from recovery init" am: 17090d7f53 am: c3b430d816

Change-Id: I77454f6071430e5c31093bd3ea3c7dc11a052a81