Merge "ART: Fix bad manual rename of local variable."
am: 24c11dcde9

* commit '24c11dcde9e8ed53813129b40f82a1af42b880b9':
  ART: Fix bad manual rename of local variable.