Merge build targets and link for VLC.
State after Labs session.

Old commit, these were done with the others. Best to get this pushed.