am 70637e40: Merge "ART: Fix mac build"

* commit '70637e40f405fa75658b3ae6bf1863be2522a11f':
  ART: Fix mac build