Merge "Revert "Clean up code duplication in build_image.py.""