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

Change-Id: Ia24ed738301da52221d64a3505b64dbdd61c7230