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