Merge "Use an in-process APK for in-process NetworkStack" am: b8f2ab9362
am: 13f2f93cd3

Change-Id: I9018b01f0cf60a8595506cc347f4afac32684e2f