Merge "Removed android.debug.JNITest from preloaded-classes"