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

Conflicts:
	include/private/android_filesystem_config.h