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