Merge "Fix duplicate checks in JNI macro assemblers."