am 411b96d6: Merge "ART: Remove some of the Mac craziness"

* commit '411b96d641a9db09c5b6bf3dcccd7198cab688ae':
  ART: Remove some of the Mac craziness