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

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