Merge "Modularize logd." am: ab28acef76
am: c955d890de

Change-Id: I2ab27da508f2a1212d3c0617bbf5037665cf3737