am cb9d211d: am 931e2684: Merge "ART: Single-frame deopt"

* commit 'cb9d211d0f9c7e13a2a5cb0aca4e190f7ade9573':
  ART: Single-frame deopt