am f7f8f15b: am 34efe4cf: Merge "mkbootfs: move fs_config to libcutils"

* commit 'f7f8f15bfbbc49342fe4258833ae56bf8cf5cb5b':
  mkbootfs: move fs_config to libcutils