Merge "Delete more unsed legacy dnsmasq files"
am: 7f7105d133

Change-Id: Ie2abd96d603cda93b8757a153bf0a809879f0b45