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

Change-Id: I999e26c5109cab0c2cefd6e979b1b69bc3f0229f