Merge "Add wifilogd to generic image"
am: c278a63560

Change-Id: I17a0285cc61f09b9ef089cc11ddb939794985dec