Merge "Remove aidl include_dirs rule in netd_integration_test"