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

Change-Id: I239527498a38084c472f1629017c993a1a52f41c