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

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