Merge "Fix netd_aidl_interface compatible problem" am: 80c3a5db12
am: 0e50b2c926

Change-Id: I6e122aa5598b56a333b47f7fa44ac306f9b4f84a