China to be biggest oil consumer by 2030