am 55f3c4c2: Merge "Fix AddressSanitizer link order and multilib setup."

* commit '55f3c4c25e4ec9cf80331aa512df8daf8d601fdf':
  Fix AddressSanitizer link order and multilib setup.