Merge "Correct FrameworksNetTests-jni-defaults lib" am: fa71b4f4a0 am: 4e3ec1f018
am: fb7a5f06b7

Change-Id: Iadd6609db0ff4f86194a9ee323cd2facaace9fa9