* Move objdetect parts to contrib * Move objdetect parts to contrib * Fix errors from CI build. * Minor fixes.