Merge "remove duplicate jni include"