Merge "logd: validate and fill in socket credentials" am: 17254f59a2
am: 1423041905

Change-Id: I80c1ec043d288ae037a208702c639acf0042fc27