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

* commit 'fbd18f1923334f3208cfe6ba5f1d4f9eb421b063':
  Revert "ART: Split out more cases of Load/StoreRef, volatile as parameter"