Refactor device-demo build dependecies