Merge "logd: remove SELinux dup handling" am: 8e6fb82af6
am: ba658099a6

Change-Id: I15ab8ad0e7787b3469fd9af1d9ed68e17e64b0c7