Merge "SDK Repository: new build-tool package type."