am 1c2a1108: am be781e55: Merge "Revert "Revert "ART: Fix StoreValue to use RefDisp when necessary."""

* commit '1c2a11089aa919e6321ac17a0f5f341f4a6f2b3e':
  Revert "Revert "ART: Fix StoreValue to use RefDisp when necessary.""