Merge "Use cutils/android_filesystem_config.h" into oc-mr1-dev