Revert "Add support for specifying build variant in brunch/breakfast"