am 4a642ee5: Merge "Remove unused JNITest class"

* commit '4a642ee5e65ca47ecf6cb274096162e580aac922':
  Remove unused JNITest class