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