Merge pull request #11366 from Minty-Meeo/old-ndk-bug Follow-up on a four-year-old Android NDK workaround
