simplify map construction to use path constructors

Test: builds, atest
Bug: 129773125
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie0faae4ed0aaab2bc9b24517af021624c32f0887
3 files changed