Merge "Use builtin bpfmt preupload check"