[ros-diffs] [ion] 16133: Final NDK fixes for kernel32