am 2a42e1fa: am b4b7fb72: Merge "ART: Fix mac build"

* commit '2a42e1fa99a7b05966958284703177d8ca3e5c89':
  ART: Fix mac build