Merge "Fix "Unknown token error" when upstream clang is used."