Fixed setup script directory search path

Change-Id: I66f326d5cc4dac4abcac490e37a4368b8074e916
Merge "Fixed setup script directory search path" into release-0.1