Merge "Re-create build directory if using existing one fails"