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

Change-Id: I3a135d48e84cb48210edbb6f44dd89316a568e6c