Merge "Revert "libcutils: fs_config: target_out_path assumed /system""