[US225] Merge

Conflicts:
	vbox86/system.prop