GitLab

When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Bug: 7131382
Change-Id: I85f9eeed418a4fcced6633c579642e947fba65d7