Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions"