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

* commit '15b849cdf2c1c443e49bfdcef1ac0da79e427227':
  ART: Fix unused variables and functions