Snap for 5999026 from 8a88bc8406b3bcd605e16e6ee95e0e798c20b3a8 to rvc-release

Change-Id: I0c6fb28dbff5c07921efd93ba648650a1b6e913a
diff --git a/jni/Android.mk b/jni/Android.mk
index 37213bc..9275849 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -20,10 +20,6 @@
         -Wno-unused-variable \
         -Wno-unused-function \
 
-# some warnings should be fixed
-LOCAL_CFLAGS += \
-        -Wno-error=sometimes-uninitialized \
-
 LOCAL_CPPFLAGS := -std=gnu++98
 
 LOCAL_SRC_FILES := \
diff --git a/jni/feature_mos_jni.cpp b/jni/feature_mos_jni.cpp
index c2dcabf..344c598 100644
--- a/jni/feature_mos_jni.cpp
+++ b/jni/feature_mos_jni.cpp
@@ -419,7 +419,7 @@
     double  t0, t1, time_c;
     t0 = now_ms();
 
-    int ret_code;
+    int ret_code = Mosaic::MOSAIC_RET_OK;
 
     if(frame_number_HR<MAX_FRAMES && frame_number_LR<MAX_FRAMES)
     {