Merge "libcutils: fs_config: target_out_path assumed /system" am: 66b8491719
am: 27c796b2f7

Change-Id: I7039e9a8e7547642fd7a7817ae470fb82ff806bb