Merge "Revert "Revert "Use NetworkStack as mainline target w/ stable API"""