Merge "logd: correctly label identical lines" am: a9b5a5e96a
am: 41e44283d2

Change-Id: Ic047a52853ea1ef9e7b8d9e7c7604b48866ee373