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

Change-Id: Ic3ef36829dddf2512b77a50dc2093b721714f997