Merge topic 'vs-android-api' into release-3.24

9d6a080421 VS: Add AndroidAPILevel element to generated project files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !7339