am b84d7a22: Revert "Revert "ART: Fix mac build""

* commit 'b84d7a226399dcc60bc0a421715ffc90ce9213f7':
  Revert "Revert "ART: Fix mac build""