Merge "Use cutils/android_filesystem_config.h" into oc-mr1-dev am: 595ff4798d
am: 4b0185e688

Change-Id: I869937e8647e3837505d34474bfa86b22098ccde