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

Change-Id: Ib76bcc82b2562831934a81d4536e83f37c08b3e8