Merge "Fix JniTest#testGetSuperclass"