Merge "libcutils: fs_config: fix "system/<partition>/" aliasing"