Merge "Revert "Replace ip_link_add with setup_network."" into master-cuttlefish-testing