Merge "ART: Fix deopt from optimized code under inlining" am: a9cf6eef38
am: 1d8bae7d82

* commit '1d8bae7d821c4c0faac9d1fa13eb341788fdb0fb':
  ART: Fix deopt from optimized code under inlining