Merge remote-tracking branch 'slim/kk4.4' into kk

Conflicts:
	include/private/android_filesystem_config.h
	rootdir/init.rc