Merge "Fix dicttool build."