Merge "Make dnsmasq src files non-executable" am: 67f523ca38
am: c1388d4c4d

Change-Id: Ifa172d25024c2175091fe66a6d1b2be7f76b664c