VOL-3978 - change the version of build tools

- fixed two minor errors in code that go 1.16 vet caught

Change-Id: Ibc5d7e966cb89bdb557a640fac70e2101a7b27b6
4 files changed