Merge "Revert "Multi-adaptor multi-device CEC tests""