[ros-diffs] [tkreuzer] 44512: [NDK] Fix some dependencies