Merge "Make NetworkStack actually build in an unbundled setup." am: 625173c148
am: d9facaa7f0

Change-Id: I3b8ee71bb61512a66f42deec3154712c3adf4d7a