Merge "Update linkerconfig to target out directory" am: 24ccfc244b am: 3dfaad538f

Change-Id: Ib39d373c1f0343c31e8390e53038d286fd28a868