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

Change-Id: Ic299caa764b424eb2c008a5dc2f102ebe7f8dc7b