Merge "Revert "Remove now-unusable 'setcon' command.""