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

Change-Id: I70840e162b5b72e88dd15a8c6b826b3251348658