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

Change-Id: I99a18638e9da927537a7f89ed17ca43c789d2379