Merge branch 'android-path-suffixes' into release-3.24

Merge-request: !7805