Merge "fix JNI use of incStrong/decStrong" into jb-mr2-dev