[ros-diffs] [ion] 16109: Final NDK fixes for ntdll