merge from open-source master

Change-Id: I5e11c6a20846bd8bf589c4a5a5ace53984150e84
diff --git a/yaffs2/utils/mkyaffs2image.c b/yaffs2/utils/mkyaffs2image.c
index 5941b51..7b989f6 100644
--- a/yaffs2/utils/mkyaffs2image.c
+++ b/yaffs2/utils/mkyaffs2image.c
@@ -540,7 +540,7 @@
         
         if((len >= 4) && (!strcmp(dir + len - 4, "data"))) {
             source_path_len = len - 4;
-        } else if((len >= 7) && (!strcmp(dir + len - 6, "system"))) {
+        } else if((len >= 6) && (!strcmp(dir + len - 6, "system"))) {
             source_path_len = len - 6;
         } else {            
             fprintf(stderr,"Fixstats (-f) option requested but filesystem is not data or android!\n");