Merge "mkbootfs: move fs_config to libcutils"