am 06814c9a: Merge "ART: Mac build fix"

* commit '06814c9a6e40e8a1e211cd40ebf6431ce4a9721d':
  ART: Mac build fix