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

Change-Id: I82a624a0fa4ee0c24dfc464ec8edb5b4f9fd8ec9