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

Change-Id: I9278e42859aacd0e54e9ee73f5fdecce7718563b