Merge "Fix build of dnssd for 32-bit arm" am: 6ad3e4000a am: 3a87013143
am: e5a9267f63

Change-Id: If4dcdbef0549836f43b6ff84d10bc17fd4210f1d