Merge "Revert "Use ld when lld fails""
am: 141fcfb5c5

Change-Id: If8f1a3417bbe818c72913c847559c7d96cef676b