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

Change-Id: If0fc49e213e094fca5a2b94218ab1fa767f742ca