Merge "Actually make fs_path_config / fs_path_config_from_file private"
am: 20670249d0

Change-Id: I38f4395c5aaa35015900f0c3e4f52d82c1e09b0f