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

Conflicts:
	ext4_utils/Android.mk

Change-Id: I813a8063bac9a19b8e89cba8445581bf8332e4f4