Merge "Update netd_aidl_interface-lateststable-ndk_platform"