Merge pull request #7632 from davidhorstmann-arm/2.28-demo-out-of-tree

[Backport 2.28] Fix demo scripts for out-of-tree builds