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

Change-Id: Ib2f62c04300ee49e48f090213491b622c5dbd5a7