Merge "Fix JNI GetSuperClasss"