Merge "Remove sdk tools from the build."