[automerger skipped] Merge "Add build targets for non-mainline NetworkStack" am: ecaef6f7f2 am: d025bbd76a -s ours
am:1f1789ceb6-s ours am skip reason: change_id I09656deb6ba928f56b478adebb60268fa6f484b0 with SHA1fc4a83bd4bis in history Change-Id: I66f96e005809423186eb1bfd6f60ce27f9a8b53a
This commit is contained in: