am da04f29a: Merge "ART: Fix some redundant declarations"

* commit 'da04f29ab1892c00490f846aba3e435ddd6696cb':
  ART: Fix some redundant declarations