am 9e4a053b: am ca7d89d0: Merge "ART: Fix Mac build"

* commit '9e4a053b42c949844baa2ab8b7f3c2c6166a5516':
  ART: Fix Mac build