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

* commit 'b60cae5a2e02b025201bb9db1bb7487e1f7992f2':
  ART: Fix max build