Merge "Remove fixup_python_packages"