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

Change-Id: I512ef494c62a648c3550484a9856714d266b4b01