Merge "Move the NetworkStack tests to unit/ to add an integration test."
am: ee18cdc67b

Change-Id: I7b46e44f63c6930474c3cf9334baa2e6ed70b86c