Merge "ART: Enable inlining under try/catch" am: 3e0597facd
am: 6a1d6a30ed

* commit '6a1d6a30ed9b0ee65a85d03ef8db140eb5cbe79e':
  ART: Enable inlining under try/catch