The Tesla boss suggested that friction could be resolved by handing over some control of Taipei to Beijing.