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

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