Merge "Fix netd_aidl_interface compatible problem"