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

Change-Id: Ib08722fac4a26f25ddba4e10b314e69f9f57a2cb