Merge "Move part of logtags stuff back to base_rules.mk."