Merge "Add VideoEditor to full builds"