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