am 42f8c1c3: Merge "ART: Fix "unused parameters""

* commit '42f8c1c39b74aae50714488525d14de30f9722c9':
  ART: Fix "unused parameters"