Android n mr1 preview 1
Merge "Add wifilogd to generic image"