Merge pull request #404 from asmorkalov:android_opencvmk_fix