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

Change-Id: Ica0b8e2cc08d8d885427be5ad58f336adb9b10a7