Merge "jni: cleanup compiler warnings" am: dc77303218
am: 6657d7b745

Change-Id: I029cc50eac229539ef606180dd9a9c2699a124a0