Merge "use s_max_mnt_count to detect mke2fs generated partition" am: 2e3abe2d05
am: 1dc9738730

Change-Id: I7e0966f9bbcb1ada7d8b4808d5462a5cee5e9eb4