Merge "Merge "move logtags rule from //build/make to //build/bazel" am: 623c1b36e4" into main-16k