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

* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
  Remove unused JNITest class