Fixed Google SDK directory path searching
Merge remote-tracking branch 'origin/dev' into dev
Fixed Google SDK directory path searching