Merge "Add a swap file to build machines"