Merge "Reorganize NetworkStack common srcs" am: 886e641f32

Change-Id: I10d789c8ec04b0e171459450d8196b1b23a028cb