Merge "ART: Fix critical edge splitting under try/catch" am: f11f5ebe32 am: c11209143b
am: d896a9a684

* commit 'd896a9a6843084975839b6a22d457cf148a4900e':
  ART: Fix critical edge splitting under try/catch