Manually merge JniConstants changes from 81fd7cc0.

(cherry picked from commit 40f73e04d8c37b456224908ad7b57210cba933c2)

Change-Id: I34de4bafbe648a7f3c467028c887c418402c7917
2 files changed