Merge "Move android_filesystem_config.h => fs_config.h" into oc-mr1-dev