Merge "0.6.3: Depend on tools/base 22.2.1"