Merge "Do not build linkerconfig for recovery" am: 5e4fe4fbf8 am: eecf7477e7

Change-Id: Ieb12fd37ca46d0c11d130404c3bd88f0feafb2ff