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

* commit '3603970d3a8a2215027e96c4861e1ab9eec86f79':
  Removed android.debug.JNITest from preloaded-classes