Merge "Compile NetworkStack as system_current" am: 17c303b79d am: d3e0862b2c
am: f6116ad4f4

Change-Id: I33f90d9a6ef9e867022b920fe6d7df59b4068c12