Merge "Revert "Use ld when lld fails""