am 6ce8ae76: am ac39bef4: Merge "common.py: Fix the build."
am 6ce8ae76: am ac39bef4: Merge "common.py: Fix the build."

* commit '6ce8ae761b8a238ce215638510230baed277235f':
  common.py: Fix the build.

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