Merge pull request #8900 from alalek:update_android_build

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/OpenCVUtils.cmake
Simple merge

diff --cc modules/core/CMakeLists.txt
index b3580f7,e27a93e..3e69dda
--- 1/modules/core/CMakeLists.txt
--- 2/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@@ -32,10 -32,14 +32,14 @@@ source_group("Src" FILES "${OPENCV_MODU
  ocv_glob_module_sources(SOURCES "${OPENCV_MODULE_opencv_core_BINARY_DIR}/version_string.inc"
                          HEADERS ${lib_cuda_hdrs} ${lib_cuda_hdrs_detail})
  
- ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ${CPUFEATURES_INCLUDE_DIRS})
+ ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS})
+ if(ANDROID AND HAVE_CPUFEATURES)
+   ocv_append_sourge_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/system.cpp "HAVE_CPUFEATURES=1")
+   ocv_module_include_directories(${CPUFEATURES_INCLUDE_DIRS})
+ endif()
  ocv_create_module(${extra_libs})
  
 -ocv_target_link_libraries(${the_module} ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}" "${LAPACK_LIBRARIES}" "${CPUFEATURES_LIBRARIES}")
 +ocv_target_link_libraries(${the_module} ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}" "${LAPACK_LIBRARIES}" "${CPUFEATURES_LIBRARIES}" "${HALIDE_LIBRARIES}")
  
  ocv_add_accuracy_tests()
  ocv_add_perf_tests()

diff --cc modules/imgcodecs/CMakeLists.txt
Simple merge