Merge "Add wifilogd to generic image" am: c278a63560 am: bc7a9d2dd4
am: 7122eb3f3c

Change-Id: I87bc7414117601dba7a389b69a37cc64ae7f0ca8