Merge topic 'android-build-host'

d1599c3f7f Fix build on Android (host)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6452