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

Change-Id: I8d853f4d91418137d4e2e6ca5e73547775a91524