Former Taiwan president Ma to make historic trip to China