Merge "Use ld when lld fails" am: e3b149c754
am: f5f128ea90

Change-Id: I4c304a9a6528dbcc462f131357ae6b9a5c35b94b