Merge "Remove SDK tools from build."