Merge "Undo symlinked libc++fs" into rvc-dev am: a1482062ec

Change-Id: I1f235b848566b501f5676842ed1c2f2f24945c72