am 20520e1c: am a5377fe9: Merge "Revert "ART: Fix StoreValue to use RefDisp when necessary.""

* commit '20520e1c0ee7a1b5e8a9dc06ee95c8e535608734':
  Revert "ART: Fix StoreValue to use RefDisp when necessary."