am a88b7b93: Merge "Fix ART build issues."

* commit 'a88b7b93e28ea86969dd3ec6a6bf6929d697fc31':
  Fix ART build issues.