Merge "Make cppreopts cleanup if it fails"
am: 9711713241

Change-Id: Icd8077bdead31ca50ba41b4c426142d438d0239c