am 376d941d: Merge "ART: Fix max build"

* commit '376d941d5d8ad23ca2880aecffbe8381be963f35':
  ART: Fix max build