Merge "Correct FrameworksNetTests-jni-defaults lib"
am: fa71b4f4a0

Change-Id: I53ca8c198b9d4bb0e743ee5010469a7375dc3cc4
tree: 88dbd34d20572e2d4f70e62fc6a2d1ee17c4dbbd
  1. core/
  2. services/
  3. tests/