Merge "native: Cleanup jni usage code"
am: e42d717194

Change-Id: Ibe07e7741da508f00eb00fe7886e497240c29c67