Merge pull request #1449 from theopolis/hikey-tbb