Merge "Use embedded native libs for NetworkStack.apk."
am: 8ead7ab7a2

Change-Id: I1a6099b9476c23c7566304b9565a06a1b0bec247