am 1ca22d17: Merge "Use integrated-as on Darwin"

* commit '1ca22d17f714c2ebae5f0b06ba6fa7dee55bb0b9':
  Use integrated-as on Darwin