Merge "Add linkerconfig to recovery"
am: 0542582560

Change-Id: I289d6441bf7ae15291d881ef12dd4686a841edee