[automerger skipped] Merge "Use embedded native libs for NetworkStack.apk." am: 8ead7ab7a2 am: f1fe530c7a -s ours
am: a5fe9b434f -s ours
am skip reason: change_id I7c9a1702a2c18e0333b5e409f04b7658fe685f97 with SHA1 103dbe38b4 is in history

Change-Id: I4bea1f3978086c2a033671ba258192304f46636f