Merge "Use ld when lld fails"
am: e3b149c754

Change-Id: Ic145eb368b83d9ea7996737f431f81e2ecf5d608