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

Change-Id: I6f232f2bdd1206cc8b7d226fdae2c53b6f40fe05