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

Conflicts:
	libc/Android.mk