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

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