Merge "Remove sdk tools from the build." into idea133