Merge "Move canned_fs_config into libcutils" am: e62cec6e39 am: b44077d8bf am: d21c737db4
am: 6efba6a826

* commit '6efba6a8260bb09fa297aeec85e535e28e8914c3':
  Move canned_fs_config into libcutils

Change-Id: I979d157a6b3ee5c11871d4dfbd7193db7df94aa8