Merge "Update build_image.sh"