Android p preview 1
Merge "Revert "clatd.c: remove unsetenv("ANDROID_DNS_MODE")""