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

Change-Id: I2c98169d190c595b9f5c4ed6c08ab79f48e5b1cf