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

* commit 'ac39bef43fb032bff75b8558f54107e733355265':
  common.py: Fix the build.