Merge "common.py: Fix the build."