Buildozer support broken?

While trying to build rfp#231 (closed) with buildozer: 'yes', I get this error:

DEBUG: > python buildozer/buildozer/scripts/client.py android release
Traceback (most recent call last):
  File "buildozer/buildozer/scripts/client.py", line 8, in <module>
    from buildozer import Buildozer, BuildozerCommandException, BuildozerException
ImportError: No module named buildozer

This seems to fix it but I am not sure it is the correct way to do it:

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 9052f262e..521561493 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -648,7 +648,10 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
             if p.returncode != 0:
                 raise BuildException("Distribute build failed")
 
-            cmd = ['python', 'buildozer/buildozer/scripts/client.py', 'android', 'release']
+            cmd = ['python', 'buildozer/setup.py', 'install', '--user']
+            p = FDroidPopen(cmd, cwd=root_dir)
+
+            cmd = ['bash', '-x', '-c', '$HOME/.local/bin/buildozer android release']
             p = FDroidPopen(cmd, cwd=root_dir)
 
         # expected to fail.

(It might also impact fdroiddata!3229 (comment 139194315).)