Merge "logd: remove logd.both test"