am af10bc4d: am a35d4c9d: Merge "ART: Refactor try/catch block info, store exception type"

* commit 'af10bc4d2400e536c238722fbc9aa0d1fea09bf7':
  ART: Refactor try/catch block info, store exception type