Merge "Revert "ART: Enable more passes under try/catch"" am: d13f2b3554
am: 08dd6bd5a7

* commit '08dd6bd5a7e40404e68754d30e9395f25344b432':
  Revert "ART: Enable more passes under try/catch"