TIMOB-13395: Android: native modules broken with android-ndk-r8e
Merge pull request #4098 from matt-langston/timob-13395-3_1_X

TIMOB-13395: Android: native modules broken with android-ndk-r8e