4.x
Merge pull request #22986 from AleksandrPanov:move_contrib_charuco_to_main_objdetect
Merge pull request #24910 from alexlyulkov:al/android-tests
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Modified java wrapping mechanism