TIMOB-15263: Android: Modules will not compile with (latest) Android NDK r9.
TIMOB-15263: Android: Modules will not compile with (latest) Android NDK r9.
Merge pull request #4744 from matt-langston/timob-15263-3_1_X

TIMOB-15263-3_1_X: Android: Modules will not compile with (latest) Android NDK r9.