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

Change-Id: I40b3bd729c7b62b6cf37e42b5a9df06b5b6fa001