Sync devtools
Use .git suffix for git sources
Sync devtools