Merge "Remove leftover support for target-as-host"