Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_external_e2fsprogs into jb-mr1