Merge "Add all-logtags-files-under macro"