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

Change-Id: I3a8917e1389963f3ae457676eb30300f7526b07c