Conflicts: * src/cmd/dist/buildtool.go Merge List: * 2020-12-23 6d03cde8 [dev.regabi] cmd/dist: automatically bootstrap cmd subdirs Change-Id: I44ecf3dd626cbd8d0b4cd1616edfd6f3db62029b