Merge "ART: minor clean-up for var_handles.cc"