Merge "ART: Fix Mac build" am: 5337bbfbd1 am: 893b4c8193
am: 994b1579c3

* commit '994b1579c324ebe9fdf589b531d00ec37e495219':
  ART: Fix Mac build