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

* commit '88aea00628cb3d90f6674f7762a8ed9f793d06cb':
  common.py: Fix the build.