[cxx-conversion] Merge from trunk

[Diego Novillo]

This merge brings cxx-conversion up to rev 186847.
I added an xfail manifest file for x86_64-unknown-linux-gnu.  When 
testing patches, please use 
contrib/testsuite-management/validate_failures.py to check for new failures.

Tested on x86_64.


Diego.