Merge "Revert "Revert "ART: Fix StoreValue to use RefDisp when necessary."""