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

Solution: Fix the qt-android build