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

Change-Id: Ia60a86398fa9f7d8a603772d06451285afeb2846