Merge "Add const to match <jni.h>."
am: 493bf736c6

Change-Id: I1835eeea68c5bb12d26cfa2a36c745e972d6a0de