Tracking ToT changes.  Clang PP APIs changed.
Merge pull request #427 from jbrodman/master

Clang ToT fixes.