Fixed android toolchain with newest NDK#21465

Merged

BillyONeal merged 2 commits intomicrosoft:masterfrom

christophe-calmejane:master

Dec 7, 2021

Commits on Nov 16, 2021

Fixed android toolchain with newest NDK
christophe-calmejane
committed

Commits on Dec 1, 2021

Fix android toolchain: Maintain backward compatibility for older NDK
christophe-calmejane
committed