Problem: qt-android build doesn't fully work for downstream builds
Solution: Fix the qt-android build
Merge pull request #1243 from jemc/master

Problem: qt-android build doesn't fully work for downstream builds