Merge "libcutils: fs_config: target_out_path assumed /system breaking partitions" am: e800b97c46
am: 0c7f2287aa

Change-Id: I12c36cfc77b74cde942d8cd87a390df3912c6cfd