Merge branch 'cm-10.1' into 'jellybean'

Conflicts:
	Android.mk