Clean up changes to resolv.conf

Change-Id: Ie2a2634c47e10c5eedbb6096f3b4bbca10ec5032