Merge "Undo symlinked libc++fs" into rvc-dev