With Elon Musk the general rules are:
(1) Believe what he's saying: his past record suggests he means it, quite literally at times.
(2) Ignore when he's saying: take any timeline he gives and double it.
China is such a huge potential market and has such strong protectionism that they'd definitely look to put manufacturing there. It'd lower costs significantly in the Chinese market and that market has huge potential.