Merge "Use netd-client instead of netd_aidl_interfaces-platform-java"