Merge "WiFi Direct Service Discovery sample" into jb-dev