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

* commit 'a1aeac80df09cf8d481474264b1ce78ed64e7464':
  Remove unused JNITest class