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

Change-Id: Iaff3d835bc30e5434d0f075293fdb48060edb3e2