Added v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC
make the sparse method give correct results on CPU ocl
Add CL_CPU to supportsFeature check
simplify the logic of pyrlk
fix hog on some CPU device running ocl
fix some mismatch on cpu device running OCL
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
Fix the problem of device selection on hybrid video systems.
Catch exceptions when large allocations fail
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data
Fix bug #2590

replaced wrong check to correct check
merge add and sub into one set of kernels
Merge pull request #780 from sivapvarma:2.4
Fix bitness detection for target platform
Merge pull request #776 from virtuald:2.4
Merge pull request #782 from taka-no-me:bitness_detection
Native activity build with Android.mk fixed.
Merge pull request #789 from asmorkalov:android_na_mk_fix
Incompatible hardware detetction added to OpenCV Manager(Feature #2941)
Automatically add CUDA support to a module if it has CUDA sources.

Backport from master.
Feature #2893 Create Java sample without layout.xml implemented.
Backported globbing from master.