Merge "Revert "Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"""