improve DNS utils
Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

Conflicts:
	src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala