am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"

* commit '940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
  Removed android.debug.JNITest from preloaded-classes