Merge \\"Cleanup warnings in jni.\\" am: 685d1d8acc
am: 2388de31e9

Change-Id: I6b4c223ed165382ffee1b9dc7ee0180f0c7ed743