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

Change-Id: Ic58350521f632729a46a6f35214bbe93452d6c5e