Fix buildtools-tarball issues breaking our builds

JIRA: SB-2649