[ros-diffs] [mf] 16616: fix ndk header usage