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

Change-Id: I0ab7a7cbd3b9e62b3914d7e194f3f148181fc1f0