Merge "ART: Fix Mac build" into nyc-dev
am: 8e181b2193

* commit '8e181b2193e0c556709d568eb2c5f38846bcd65f':
  ART: Fix Mac build

Change-Id: Ib87e11050d0f1c79e14d9fd0e3f7d5034ff9676b