Merge "Fix netd_aidl_interface compatible problem"
am: 80c3a5db12

Change-Id: I62727dac8c3345c7bc5faefaef81b988b71f3742