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

Change-Id: Ib06753d315d5e656a7800377aa6209f86ef7135a