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

* commit '7f474a0dfefb45021303de4702f6a4409536cfa6':
  ART: Remove some of the Mac craziness