Merge "Moved include/android_filesystem_*.h and canned_fs_config.h to libcutils"
am: a4bc98941a

Change-Id: Ib90d711895c8a75f5abec2284ff66723c4f5b35e