am 49d06286: am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."
am 49d06286: am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."

* commit '49d062864b0cc4211377678ba5337acb20aa86fa':
  Fix a typo in my_cppflags assignment.

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