Merge "Move android_filesystem_config.h => fs_config.h" into oc-mr1-dev
am: f004d8de4d  -s ours

Change-Id: I952be233a388c2a78bad9c41f67b858bd3e4db9a