Merge "Move canned_fs_config into libcutils"