[ros-diffs] [ion] 16236: Fix more ddk/ndk missing defintions