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

Change-Id: Ic731e980b4b13e6f0ce62bada9e9cc6a77052eee