Merge "Add pre-build step to prep vm before build"