Merge "Remove test dependency on ubsan runtime"