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

Change-Id: Ib5c1ff976886dfc74ffc1cc70b3ff3311cc30922