Merge "Add build dir to build_image.sh"