Merge "add logtags dependency as srcs instead of deps"