Merge "Correct usage message for build_image.py"