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

Change-Id: I3ac47246a6c96ed3bc4b2308a17bc669ec79b1a7