Merge "ART: Fix Mac build"
am: 5337bbfbd1

* commit '5337bbfbd1cd502bb2842698a6b2a543ab6a6c32':
  ART: Fix Mac build