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

Change-Id: I69e5550ed833bbac5d2cde0ebf7d4ad086fd1877