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

* commit '893b4c819321253f36bdca778aeb5d3ada871ae7':
  ART: Fix Mac build