Merge "Make cppreopts cleanup if it fails"