Commit 3b273b01 authored by Matthew Waters's avatar Matthew Waters 🐨

Partial revert of 9ed6305e

For post-merge of android ndk-21 as part of:
!266
cerbero!463
parent 9ed6305e
Pipeline #128845 waiting for manual action with stages
in 20 minutes and 22 seconds