[ros-diffs] [fireball] 33989: - NDK fixes (structure rename only).