Merge "Move canned_fs_config into libcutils" am: e62cec6e39
am: b44077d8bf

* commit 'b44077d8bfc719851dee30c5a831fc567d710d2b':
  Move canned_fs_config into libcutils

Change-Id: If295243e346b89c66ecf114ee889b7d821bce3ac