The NBA makes a comeback in China 6 years after a tweet set off a political firestorm