Merge "Remove unused JNITest class"