From: Alex Light <allight@google.com>
Date: Wed, 23 Aug 2017 19:53:51 +0000 (+0000)
Subject: Merge "Make cppreopts cleanup if it fails" am: 9711713241 am: ac9b39c5ed
X-Git-Tag: android-x86-9.0-r1~59^2~160
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=128f8d6b790d7683d909a5c08b421ad4b4a157ef;p=android-x86%2Fsystem-extras.git

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

Change-Id: I974bac16ffe6b1963defd3af8ffaf28152d53ff0
---

128f8d6b790d7683d909a5c08b421ad4b4a157ef