Disable resolvconf on ubuntu

And just use a static resolv.conf file instead.  There are too many
conditions in which resolvconf might find itself, and this is much
simpler anyway.

Change-Id: I71b80e533afa93a659c634db5e6b9abf6134ab58
Merge "Disable resolvconf on ubuntu"