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

Change-Id: I616f745e67bd1355b9c4933e32fa3b0e97f42c38