Merge "Correct FrameworksNetTests-jni-defaults lib"