am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"

* commit '25c55ca902f570d3a89753c6eb9492c20dd734ba':
  Remove unused JNITest class