Merge "runtime: Don\'t skip verification for -Xverify:soft-fail" am: 867d63b65f
am: d5b4ac600c

* commit 'd5b4ac600ca5e3dbacc2fb887e24c9342e1eda97':
  runtime: Don't skip verification for -Xverify:soft-fail