Android n mr2 preview 1
Merge "[mDNS] Support interface names larger than 8 characters" am: 55aee11ccd am: bfa1e214f5
am: 068930a799

Change-Id: I3a29a0030ff9d7c9ead419be48d3683dbd6963e4