Merge "Update ld config to use build-time determined paths." am: 70b3fdce20
am: 5933e83e1d

Change-Id: I563e2fb8323c1ef5a26037f5c4d089d8f53ac634