[ros-diffs] [fireball] 48395: - Fix user32 build by merging header updates (44999-48394).