master
Reland "[Android] Add mechanism for setting Android engine flags via Android manifest (take 2)" (#182522)
Re-specify the ndk version in various test apps, to prevent ndk download (#183134)