Merge voxeo into voxeo-bundle

https://trello.com/c/tyrdiWYT

Change-Id: I09aaca11c02d2d44de07ae6ca3a0eb45825e5229