Merge "libcutils: fs_config: fix "system/<partition>/" aliasing" am: 449bfd7a93 am: cd3584e90b am: 609b4cf6a5
am: 52c61939c3

Change-Id: I5a5cea577e24c8a40e179200a55536d647400033