fixed ocl::merge in case of 2 and types CV_32S and CV_32F
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.
fixed HOG perf test
Merge remote-tracking branch 'upstream/master'
increased time limit for bilateral filter performance tests
Merge pull request #1376 from StevenPuttemans:bugfix_3186
Merge pull request #1413 from melody-rain:2.4_kalman_filter
Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog
Merge pull request #1417 from ilya-lavrenov:merge_fix
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown
Eliminated unsequenced assignments to temp3 from dpstereo.cpp.

They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
MediaRecorder hint enabled for all Android devices with API level 14 and above.

It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
Merge pull request #1421 from ilya-lavrenov:ocl_bilateral
Added performance for Kalman Filter.
Removed whitespace.
Merge pull request #1431 from asmorkalov:android_recording_hint
Merge pull request #1432 from SpecLad:unseq
Revised the code according to the feedback of the community.
Some improvements in ABI compatibility checker config generator.

JNI check became optional;
Pathes to SDK, NDK and Java API level can be defined by command line.
Merge pull request #1386 from asmorkalov:android_abic_check_opt_java