Merge "Reorganize NetworkStack common srcs" am: 886e641f32 am: 269580ea0d am: ffabd2b050

Change-Id: I02ebe684b912b345325fc762422b0a4071b2583d