am ca7d89d0: Merge "ART: Fix Mac build"

* commit 'ca7d89d09294254f16db170a53b0f8dfbf0213ac':
  ART: Fix Mac build