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

Change-Id: I24515bf865f06ca8d215637228700a1e312993d7