Merge "Move NsdServiceTest to correct directory" am: 0a76f99621
am: ca9fcb79f6

Change-Id: Ia3f79fbcead21fdf4914b18905cd3b067ac7c806