[DF-4152] Android merge fix for threads and JNI fix.