SkQP: clean up make_universal_apk.py

Now works better when mixing docker and non-docker builds.

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86-devrel-Android_SKQP

Change-Id: I968a855ee9e6c9899aaf514d7a19a145bc818a28
Reviewed-on: https://skia-review.googlesource.com/c/183388
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
1 file changed