Merge "logd: strip out empty trailing iovec" am: 6b11faeb42
am: d749a054ff

Change-Id: If8441997a5cefc4af09d3930a23ae69412ce11fa