Fix bug 1360380
	Use the new setup scritp names

Change-Id: I7b17bee6fb1b97032f980e1cd80d8965cd4517aa
Merge "Fix bug 1360380 	Use the new setup scritp names"
Merge remote-tracking branch 'upstream/master'