[automerger skipped] Opportunistic cleanup of NetworkFactory. am: 72364eff71 -s ours am: e27a992eda -s ours

am skip reason: Change-Id Ic3c84cc1e12e06a8f007464fdd3ec11b989bd3aa with SHA-1 11f0df84e1 is in history

Change-Id: I581a5228a5f887d594841a03f9990dfe8a572e1c
tree: 67d1d6835541e07d03349c9ff8ec63cf562e0498
  1. staticlibs/