Merge "Remove makefiles for vr_window_manager"