clean up usage of vcs.mk Bump hammer and plugins for updated API
Still need to work on the asm-test/benchmark integration