Merge "Fix FindCatchBlock to work in -Xverify:none mode."