What country was at war with Japan in China prior to World War II