Bump build number when uploading tools during bootstrap

CI was broken due to expectations of build number
being bumped when we upload tools for bootstrap.
Bumping the build number also makes it more straightforward
to identify tools that have been uploaded vs. official ones.
Merge pull request #619 from axw/bootstrap-uploadtools-bump-build

Bump build number when uploading tools during bootstrap

CI was broken due to expectations of build number
being bumped when we upload tools for bootstrap.
Bumping the build number also makes it more straightforward
to identify tools that have been uploaded vs. official ones.