Merge "Work around b/24465209, do not use clang lld"
am: 85bd9ca978

Change-Id: I0a7a65b2be3e20b31d85645d920792b8255e344e