Better support for build variants (flavor + build type)