Merge "Use realpath to grab underlying path for userdata" into rvc-dev am: ae7f2edaf4

Change-Id: I1e84bc082295a7fcd8a44f1d1acc8e08ed66b737