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

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