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