Terminal Fix_Permissions support

Conflicts:
	device-common.mk