am afc51b92: am c4dbc16e: Merge "Make cpp.py less braindead."

* commit 'afc51b92a0e531f05e0e5477ea857a8669e5e5d1':
  Make cpp.py less braindead.