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

Change-Id: I7b18ac2e342e3eb4641b72e9d129fc31e7807f24