Merge "logd: fix bad test assumptions"