Merge "Compile NetworkStack as system_current"
am: 17c303b79d

Change-Id: If74cbb1e9f59373636350c24aa07831d1705db49