Finish swapping out external/* with OctOS repos