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

Change-Id: I4437757ba95f39d62a3418214d780f36daaada6e