Fix variable names for Clang-based compilation.

Change-Id: I69b28110e9fda63abb3770da7a1127af4e1f2963
2 files changed