[automerger skipped] Make NetworkFactory a single-use object. am: 029a7f0dc0 am: 6281d1878b -s ours

am skip reason: Change-Id Icf4c7a957e46e4ba017c0a5984e5c42a75b36ecd with SHA-1 af8c6f012d is in history

Change-Id: I55571c08e3de447b395f3004905a76cf4b9c1c96
tree: c6aa955dbe5bdd942d9526894b15f549203e26d3
  1. staticlibs/