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

Change-Id: I4fda42de0adde2c343943ad6e76ee5d0a309ad6e