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

* commit '0bf47b050f0cd99c47c9a47386aedbd6d3c3edf4':
  ART: Fix deopt from optimized code under inlining