Merge "Add build targets for non-mainline NetworkStack"
am: ecaef6f7f2

Change-Id: I908e9c93c95783a44f2f1a61d298fae51585aea8