Copy ocl::queryDeviceInfo interface from master to 2.4.
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
'aapt' tool moved in SDK r22, adding support to run.py
Simple set of the camera index to allow the user to change it after the object has been initialized.
Fix the mismatch on NV GPUs
Merge pull request #882 from pengx17:2.4_rewrite_query_info
Merge pull request #902 from apavlenko:fix_run_py
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
Merge pull request #904 from ograycode:2.4
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Pull requests:
	#904 from ograycode:2.4
	#905 from bitwangyaoyao:2.4_TVL1
	#902 from apavlenko:fix_run_py
	#882 from pengx17:2.4_rewrite_query_info

Conflicts:
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/tvl1flow.cpp
Merge pull request #921 from SpecLad:merge-2.4
update util.hpp to fix OpenCL import on case sensitive mac FS

On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
update safe_call.hpp to fix OpenCL import on case sensitive mac FS

On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
Merge pull request #945 from malcolmreynolds:master