Everything that he has been saying lately implies that they won't drop them. They may add other suppliers (especially for the factory in China), but they will likely always rely on suppliers for the cells themselves. I can't really think of a good reason for this to change.

After all, they are by far the world's largest consumer of batteries. They have leverage.