Merge "Fix Polly build with freshly checked-out source"