Merge "Remove unneeded shims and jni binding code"