ART: Prepare to remove VERIFY_ERROR_UNRESOLVED_CATCH
am: 4146e06484

Change-Id: I2ed4b80775b30a44f005ac3bbb821adf3601075c