Merge "Fix warnings from static analysis tools(jni)" am: f894e1f2af

Change-Id: I81df3f3eeadf96b4d82f123b0f6e1861ade2dd17