Merge branch 2.4

Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4

diff --cc modules/contrib/include/opencv2/contrib/contrib.hpp
Simple merge

diff --cc modules/contrib/src/detection_based_tracker.cpp
index 238ac5c,a1e5dea..11263a8
--- 1/modules/contrib/src/detection_based_tracker.cpp
--- 2/modules/contrib/src/detection_based_tracker.cpp
+++ b/modules/contrib/src/detection_based_tracker.cpp
@@@ -1,14 -1,9 +1,16 @@@
  #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID)
  #include "opencv2/contrib/detection_based_tracker.hpp"
  
+ #include <pthread.h>
+ 
 +#if defined(DEBUG) || defined(_DEBUG)
 +#undef DEBUGLOGS
  #define DEBUGLOGS 1
 +#endif
 +
 +#ifndef DEBUGLOGS
 +#define DEBUGLOGS 0
 +#endif
  
  #ifdef ANDROID
  #include <android/log.h>

diff --cc modules/core/include/opencv2/core/core.hpp
Simple merge