Launch nested weston instead of weston-terminal

Change-Id: I6d8e57e45cd4ded12035f595ac08779ad66a0e5f