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

Change-Id: I7d300df4dc4bcc769424c2b823359dc036252b1a