[ros-diffs] [ion] 19479: Fix msvc/gcc NDK problem