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

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