Merge "AttachInterfacesTest: use build_timeout on iterface deletion"