Merge "Add build_dir variable for build"