Upstream updates

Conflicts:
	ramdisk/fstab.doubleshot
	ramdisk/init.doubleshot.rc
More Upstream updates