(cherry picked from commit b75cbfde45) Conflicts: cmake/OpenCVModule.cmake
b75cbfde45
See http://opencv.org/android