[atv] cleanup build
Merge branch 'master' of github.com:oe-alliance/oe-alliance-core into beta