Diageo's latest Johnnie Walker House in China is to share space with the company's baijiu brand, Shuijingfang.