Merge "Revert "Modularize logd.""