Merge "libcutils: create private/fs_config.h" into oc-dev