Merge branch 'FindJNI-android-api' into release-3.24

Merge-request: !7801