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

Change-Id: I9bd53ab05c27c414a7ac06f189ea484e2737852c