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

Change-Id: I399f82026a4b4a77338dbdbbd2c923a9692f9b07