am 4cc2898e: am a61a3295: Merge "ART: Mac build fix for unused constant"

* commit '4cc2898eacc3a7f16b809e16728a3c5a62e1eb68':
  ART: Mac build fix for unused constant