Fix bad variable names.
Fix bad variable names.

My working tree was still dirty when I verified the original change.

Change-Id: I3e6fa6908b809c016231b398c5d30d8cce3b87ab

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build