am b4b7fb72: Merge "ART: Fix mac build"

* commit 'b4b7fb72f4f394f10bb9e977dbb82062e4d79212':
  ART: Fix mac build