[ros-diffs] [cfinck] 30166: Fix bootcd build for real now