Merge "Revert "network_stack: Move network_stack @hide bypass to platform""