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

Change-Id: I1032e98dbe526b02aa197d634db66c3dcb60fc06