[ros-diffs] [tfaber] 56777: [PSDK][NDK] - Fix build