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