Merge "runtime: Don't skip verification for -Xverify:soft-fail"