Merge remote-tracking branch 'upstream/3.4' into merge-3.4

diff --cc CMakeLists.txt
index 41a4306,831602a..9a35ceb
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -419,11 -432,8 +419,11 @@@ OCV_OPTION(WITH_IMGCODEC_PFM "Include P
  OCV_OPTION(WITH_QUIRC "Include library QR-code decoding" ON
    VISIBLE_IF TRUE
    VERIFY HAVE_QUIRC)
 +OCV_OPTION(WITH_ANDROID_MEDIANDK "Use Android Media NDK for Video I/O (Android)" (ANDROID_NATIVE_API_LEVEL GREATER 20)
 +  VISIBLE_IF ANDROID
 +  VERIFY HAVE_ANDROID_MEDIANDK)
  OCV_OPTION(WITH_TENGINE "Include Arm Inference Tengine support" OFF
-   VISIBLE_IF (ARM OR AARCH64) AND UNIX AND NOT ANDROID AND NOT IOS
+   VISIBLE_IF (ARM OR AARCH64) AND (UNIX OR ANDROID) AND NOT IOS
    VERIFY HAVE_TENGINE)
  
  # OpenCV build components

diff --cc doc/tutorials/imgproc/histograms/template_matching/template_matching.markdown
Simple merge

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

diff --cc modules/core/test/test_mat.cpp
Simple merge

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

diff --cc modules/dnn/misc/python/test/test_dnn.py
Simple merge

diff --cc modules/dnn/src/onnx/onnx_importer.cpp
Simple merge

diff --cc modules/dnn/test/test_onnx_importer.cpp
Simple merge