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

Change-Id: I01cfbcc4339d9b75be426b0ad4230cb71bac6535