Merge "[AWARE] Add builder pattern for Wi-Fi Aware NetworkSpecifier"