[automerger skipped] Merge "Add build targets for non-mainline NetworkStack" am: ecaef6f7f2
am: d025bbd76a -s ours
am skip reason: change_id I09656deb6ba928f56b478adebb60268fa6f484b0 with SHA1 fc4a83bd4b is in history

Change-Id: I5ff9fcdb526e57c91c765b39b3ca742ce49fe234
tree: 3e906d5b05715913b9493c793b6b1bef635fea9e
  1. src/
  2. Android.bp
  3. AndroidManifest.xml