Merge "ART: Fix simplification of catch blocks in the presence of dead code" am: b203aad7a0
am: e7106f2080

* commit 'e7106f2080aace9e7855e18d212d34b22fc2a6b3':
  ART: Fix simplification of catch blocks in the presence of dead code