Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	extract-files.sh
Merge branch 'cm-10.1' of git://github.com/Team-Hydra/android_device_samsung_galaxys2-common into cm-10.1