classes/files renaming, some code refactoring

modules/java/src/cpp/Android.cpp

@@ -9,12 +9,12 @@ extern "C" {
 #endif
 
 /*
- * Class:     org_opencv_android
+ * Class:     org_opencv_Android
  * Method:    nBitmapToMat(Bitmap b)
  * Signature: (L)J
  */
 
-JNIEXPORT jlong JNICALL Java_org_opencv_android_nBitmapToMat
+JNIEXPORT jlong JNICALL Java_org_opencv_Android_nBitmapToMat
   (JNIEnv * env, jclass cls, jobject bitmap)
 {
     AndroidBitmapInfo  info;
@@ -40,11 +40,11 @@ JNIEXPORT jlong JNICALL Java_org_opencv_android_nBitmapToMat
 }
 
 /*
- * Class:     org_opencv_android
+ * Class:     org_opencv_Android
  * Method:    nBitmapToMat(long m, Bitmap b)
  * Signature: (JL)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_opencv_android_nMatToBitmap
+JNIEXPORT jboolean JNICALL Java_org_opencv_Android_nMatToBitmap
   (JNIEnv * env, jclass cls, jlong m, jobject bitmap)
 {
     AndroidBitmapInfo  info;

modules/java/src/cpp/converters.cpp

@@ -1,8 +1,8 @@
-#include "utils.h"
+#include "converters.h"
 
 #ifdef DEBUG
 #include <android/log.h>
-#define MODULE_LOG_TAG "OpenCV.utils.cpp"
+#define MODULE_LOG_TAG "OpenCV.converters"
 #define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__))
 #else //DEBUG
 #define LOGD(...)