Merge "logd: remove logd.both test" am: fb897dc1f5
am: 06a8db7180

Change-Id: I1c386a632699aefdb87495f10835db03fca7c901