Merge "Remove dependency on jni.h from WordProperty."