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

Change-Id: I074b42411163b0aec47e7385ec8fbc3abbe33e87