test: fix and re-add bootimg analyze tests

fix bootimg analyze unit tests

.gitlab-ci.yml

@@ -33,13 +33,7 @@ codespell:
 pytest:
   stage: test
   script:
-<<<<<<< Updated upstream
-    - "apk -q add git android-tools"
-||||||| Stash base
-    - "apk -q add git"
-=======
-    - "apk -q add git kpartx losetup"
->>>>>>> Stashed changes
+    - "apk -q add git android-tools kpartx losetup"
     - "su build -c 'git config --global user.email ci@ci'"
     - "su build -c 'git config --global user.name CI'"
     - "echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"