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

Conflicts:
	camera/Android.mk