am cc2daede: Merge "Properly recover from failed compilation."

* commit 'cc2daede56257f0f1f490a1aebf5b9b898d9816a':
  Properly recover from failed compilation.