Merge "Revert "clatd.c: remove unsetenv("ANDROID_DNS_MODE")""
am: 3d7e939b89

Change-Id: I41333ccbafc3646285c3145acfe3000e15873dc7