Merge "Revert "Modularize logd."" am: ab80b02493
am: 4324ba0b4a

Change-Id: Ib9af3c50550a8f647a30eb89455253db29bd2841