am af2d5307: Merge "ART: Fix unused variables and functions"

* commit 'af2d5307c3beaf3f0e9712f88c56c53cecdc06a7':
  ART: Fix unused variables and functions