Merge "logd: trailing spaces in log statistics (part deux)" am: 2ead17196c am: 741051d066
am: 2263d78515

Change-Id: Id7b47c545378db96935133722ebcf92090633c30