am e4707ae7: Merge "Ignore catch blocks whose type can\'t be resolved."

* commit 'e4707ae7985a4f855b97f3b20d99fb55368f44ad':
  Ignore catch blocks whose type can't be resolved.