[ros-diffs] [tkreuzer] 58165: [NDK] Revert accidental changes.